andygrove opened a new pull request, #6284:
URL: https://github.com/apache/datafusion-comet/pull/6284
Backport of #6218 to `branch-1.1`.
Cherry-picked from `2d1ee49a037a1a0826371fad53f4f7670943addc` without
conflicts. Of the six files it changes, five are identical on `branch-1.1` and
on `main` just before #6218. `ci.yml` differs only by the "Check Iceberg write
report summary" step from #6155, which is not on this branch. So every changed
line is identical to upstream, and only three hunk offsets in `ci.yml` differ.
## Which issue does this PR close?
None. Part of #5327.
## Rationale for this change
`branch-1.1` was cut at 36ab57c68 before #6218 merged, so its `ci.yml` has
neither the release-branch routing nor the `docs` guard:
- A pull request against `branch-1.1` runs only the PR tier: the Linux build
and the Comet suites on Spark 4.1. The other suites wait for the merge queue or
the nightly, and a release branch has neither, so here they never run. #6236
and #6266 merged with the PR tier alone, plus the Spark 4.1 SQL suite that
#6266 was labeled for. No Iceberg, PyArrow or macOS job has run on a pull
request against this branch, and neither has any Spark profile other than 4.1.
- The `docs` job has no `refs/heads/main` guard. The release process now has
a step that dispatches `ci.yml` on the release branch before each release
candidate, and a dispatch here would build this branch's docs and publish them
over the website. `ci.yml` must not be dispatched on `branch-1.1` until this
lands.
## What changes are included in this PR?
The original change, so see #6218 for the details. No adaptations were
needed. In short:
- `compute-changes.py`: a pull request whose base matches `branch-N.M` runs
every job in the `pr`, `queue` and `nightly` tiers, still routed by the path
filters. `docs` stays push-only, and Spark 3.4 still needs its label.
- `ci.yml`: `Detect changes` passes the base branch as `PR_BASE_REF`, and
the `docs` job also requires `github.ref == 'refs/heads/main'`, so a dispatch
on this branch skips the deploy.
- `check-ci-config.py`: the release-branch policy cases, a check on the
variables `Detect changes` passes to `compute-changes.py`, and a check that
fails if the `docs` guard is dropped.
- The release process, the CI guide and the workflows README: the
release-branch routing, and the full-suite dispatch before each release
candidate.
The contributor guide is not published from this branch, because the website
is built from `main` and takes only the user guide from here. The doc changes
are included anyway, so the cherry-pick stays clean and the branch's docs
describe its own `ci.yml`.
## How are these changes tested?
- `python3 dev/ci/check-ci-config.py` passes on this branch, including
#6218's new policy cases and its checks on `PR_BASE_REF` and the `docs` guard.
- `actionlint` reports the same 26 findings with and without this PR. All
are shellcheck info and style notes in workflows this PR does not touch, and
none is in `ci.yml`.
- `prettier --check` passes on the three changed Markdown files.
- `compute-changes.py`, run with this PR's changed files and the environment
CI sets:
| Pull request | Outputs that are true
|
| ---------------------------------------------- |
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
| this one, against `branch-1.1` | `build_linux`,
`build_linux_full`, `build_linux_all_profiles`, `build_macos`, `delta_gate`,
`pyarrow_udf`, `spark_3_5`, `spark_4_0`, `spark_4_1`, `spark_4_1_hive` and all
four Iceberg versions |
| the same files, against `main` | `build_linux`,
`build_linux_full`
|
| this one, `labeled` with `run-spark-3.4-tests` | `spark_3_4`
|
This PR's own run is the first real exercise of the routing, as #6218
anticipated. A pull request runs the workflow files from its merge commit, and
this one changes `ci.yml`, so its run should include every suite except Spark
3.4, the benchmark check and the site deploy. Most of those suites have never
run against this branch, so a failure in one may come from the branch rather
than from this change.
--
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]
