pan3793 opened a new pull request, #7566:
URL: https://github.com/apache/kyuubi/pull/7566
Logical backport of the two GHA modernization commits to `branch-1.10`,
delivered as two commits that mirror master's split (`#7561` then `#7564`).
### Commits
1. **[KYUUBI #7561] [INFRA] Cache CI engine archives per URL with a reusable
action** (`2a278f2db`)
Cherry-picked from master's `445a906c2`. Replaces the single-blob
`cache-engine-archives` action with per-URL `download-archive` caching, adds
`resolve-engine-archive-urls.sh` / `expose-engine-homes.sh`, rewires every
`master.yml` job to resolve → download → expose only the engines it needs, adds
the `spark-home-from-archive` profile to the Spark-3.3/3.4/3.5 extension poms,
and makes the Flink test helpers honor `FLINK_HOME`.
- **Conflict resolution:** the only hunk that did not auto-merge was the
`default` job's `Setup Python` step. master's `#7561` switched `python-version:
'3.9'` → `${{ matrix.python }}` (master had a `python` matrix dim);
`branch-1.10`'s `default` matrix has no `python` dimension, so the value is
kept as `'3.9'` and #7561's inserted resolve/download/expose steps are adopted
verbatim. All other jobs auto-merged.
- The `kyuubi-extension-spark-4-0` / `-4-1` poms that #7561 modified are
absent on `branch-1.10` (those modules don't exist on this branch), so the
modify/delete conflict is resolved by dropping them.
2. **[INFRA] Bump GHA workflows to latest action versions** (this PR's tip)
Logical backport of `#7564` (master `99bed3885`). `#7564`'s literal delta
is anchored on master's dependabot-bumped versions (e.g. `v7.0.0 -> v7`) which
`branch-1.10` never carried, so it is reimplemented by bumping `branch-1.10`'s
baseline directly — the conflict-free equivalent. The resulting `uses:` set now
matches master exactly.
### Why are the changes needed?
Keep `branch-1.10` CI on the latest GitHub Actions versions (per the
[apache/infrastructure-actions
allowlist](https://github.com/apache/infrastructure-actions/blob/main/actions.yml))
and on the per-engine archive caching introduced in #7561.
### How was this patch tested?
- After the cherry-pick, `master.yml` has no leftover
`cache-engine-archives` references and no unresolved conflict markers; only the
one expected hunk was hand-merged.
- After the version normalization, the `uses:` set on `branch-1.10` matches
master exactly; no old version tokens remain.
- `./dev/reformat` was run; it only failed on the Spotless `black` step (a
local pyenv-shim issue, exit 127) and modified no files — YAML is not
Spotless-managed, and the #7561 source changes are authored against master and
are Spotless-clean.
- CI on this PR will exercise the new per-engine download flow across the
`master.yml` matrix.
### Was this patch authored or co-authored using generative AI tooling?
Assisted-by: codemaker with glm-5.2
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
