Skip to content

CI: test broad fix batches once and safely retire source PRs #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brandonpayton wants to merge 1 commit into from
Closed

CI: test broad fix batches once and safely retire source PRs #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/actions/detect-change-scope/ci-scope-paths.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ package_declared_build_input_changed_files() {
package_publish_flow_changed_files() {
grep -E \
-e '^\.github/actions/detect-change-scope/(ci-scope-paths|test-ci-scope-paths)\.sh$' \
-e '^\.github/workflows/(staging-build|prepare-merge|activate-merge-candidate|recover-rejected-merge-candidate|staging-cleanup|force-rebuild|reusable-package-source-publish)\.yml$' \
-e '^\.github/scripts/(activate-merge-candidate|cleanup-merge-candidates|clone-rejected-merge-candidate|compose-staging-release-snapshots|download-verified-release-asset|fetch-canonical-index|github-api-get|init-merge-candidate|latest-merge-gate-status|mark-merge-candidate-ready|reconcile-merge-candidates|recover-canonical-indexes|require-exact-head-approval|select-package-archive-source|state-lock|test-activate-merge-candidate|test-cleanup-merge-candidates|test-clone-rejected-merge-candidate|test-download-verified-release-asset|test-fetch-canonical-index|test-init-merge-candidate|test-latest-merge-gate-status|test-merge-candidate-workflows|test-reconcile-merge-candidates|test-recover-canonical-indexes|test-require-exact-head-approval|test-select-package-archive-source|test-state-lock|test-validate-staging-release|test-verify-merge-candidate|validate-staging-release|verify-merge-candidate)\.sh$' \
-e '^\.github/workflows/(staging-build|prepare-merge|activate-merge-candidate|recover-rejected-merge-candidate|staging-cleanup|force-rebuild|reusable-package-source-publish|verify-integration-batch|finalize-integration-batch)\.yml$' \
-e '^\.github/scripts/(activate-merge-candidate|cleanup-merge-candidates|clone-rejected-merge-candidate|compose-staging-release-snapshots|download-verified-release-asset|fetch-canonical-index|finalize-integration-batch|github-api-get|init-merge-candidate|latest-merge-gate-status|mark-merge-candidate-ready|reconcile-merge-candidates|recover-canonical-indexes|require-exact-head-approval|select-package-archive-source|state-lock|test-activate-merge-candidate|test-cleanup-merge-candidates|test-clone-rejected-merge-candidate|test-download-verified-release-asset|test-fetch-canonical-index|test-finalize-integration-batch|test-init-merge-candidate|test-latest-merge-gate-status|test-merge-candidate-workflows|test-reconcile-merge-candidates|test-recover-canonical-indexes|test-require-exact-head-approval|test-select-package-archive-source|test-state-lock|test-validate-staging-release|test-verify-merge-candidate|validate-staging-release|verify-merge-candidate)\.sh$' \
-e '^\.github/integration-batches/' \
-e '^tools/xtask/src/(build_index|bundle_program|index_candidate|index_toml|index_update|staging_reuse|update_pkg_manifest)\.rs$' \
-e '^scripts/(compose-initial-index|index-has-current-entry|index-update|prepare-sdk-package|publish-package-source|release-index-state|sync-package-source)\.sh$' \
-e '^tests/scripts/(index-update|package-publish-flow|release-index-state)\.sh$' \
Expand All @@ -74,8 +75,9 @@ kernel_runtime_changed_files() {

ci_control_changed_files() {
grep -E \
-e '^\.github/workflows/(staging-build|prepare-merge|activate-merge-candidate|recover-rejected-merge-candidate|staging-cleanup|force-rebuild|reusable-package-source-publish)\.yml$' \
-e '^\.github/scripts/(activate-merge-candidate|cleanup-merge-candidates|clone-rejected-merge-candidate|compose-staging-release-snapshots|download-verified-release-asset|fetch-canonical-index|github-api-get|init-merge-candidate|latest-merge-gate-status|mark-merge-candidate-ready|reconcile-merge-candidates|recover-canonical-indexes|require-exact-head-approval|select-package-archive-source|state-lock|test-activate-merge-candidate|test-cleanup-merge-candidates|test-clone-rejected-merge-candidate|test-download-verified-release-asset|test-fetch-canonical-index|test-init-merge-candidate|test-latest-merge-gate-status|test-merge-candidate-workflows|test-reconcile-merge-candidates|test-recover-canonical-indexes|test-require-exact-head-approval|test-select-package-archive-source|test-state-lock|test-validate-staging-release|test-verify-merge-candidate|validate-staging-release|verify-merge-candidate)\.sh$' \
-e '^\.github/workflows/(staging-build|prepare-merge|activate-merge-candidate|recover-rejected-merge-candidate|staging-cleanup|force-rebuild|reusable-package-source-publish|verify-integration-batch|finalize-integration-batch)\.yml$' \
-e '^\.github/scripts/(activate-merge-candidate|cleanup-merge-candidates|clone-rejected-merge-candidate|compose-staging-release-snapshots|download-verified-release-asset|fetch-canonical-index|finalize-integration-batch|github-api-get|init-merge-candidate|latest-merge-gate-status|mark-merge-candidate-ready|reconcile-merge-candidates|recover-canonical-indexes|require-exact-head-approval|select-package-archive-source|state-lock|test-activate-merge-candidate|test-cleanup-merge-candidates|test-clone-rejected-merge-candidate|test-download-verified-release-asset|test-fetch-canonical-index|test-finalize-integration-batch|test-init-merge-candidate|test-latest-merge-gate-status|test-merge-candidate-workflows|test-reconcile-merge-candidates|test-recover-canonical-indexes|test-require-exact-head-approval|test-select-package-archive-source|test-state-lock|test-validate-staging-release|test-verify-merge-candidate|validate-staging-release|verify-merge-candidate)\.sh$' \
-e '^\.github/integration-batches/' \
-e '^scripts/(compose-initial-index|index-update|release-index-state)\.sh$' \
-e '^tests/scripts/(index-update|package-publish-flow|release-index-state)\.sh$' \
-e '^\.github/actions/detect-change-scope/' \
Expand Down
27 changes: 27 additions & 0 deletions .github/actions/detect-change-scope/test-ci-scope-paths.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,15 @@ assert_matches package_publish_flow_changed_files \
assert_matches package_publish_flow_changed_files \
".github/scripts/test-activate-merge-candidate.sh" \
".github/scripts/test-activate-merge-candidate.sh"
assert_matches package_publish_flow_changed_files \
".github/scripts/finalize-integration-batch.sh" \
".github/scripts/finalize-integration-batch.sh"
assert_matches package_publish_flow_changed_files \
".github/scripts/test-finalize-integration-batch.sh" \
".github/scripts/test-finalize-integration-batch.sh"
assert_matches package_publish_flow_changed_files \
".github/integration-batches/batch-1001.json" \
".github/integration-batches/batch-1001.json"
assert_matches package_publish_flow_changed_files \
".github/scripts/clone-rejected-merge-candidate.sh" \
".github/scripts/clone-rejected-merge-candidate.sh"
Expand Down Expand Up @@ -201,6 +210,12 @@ assert_matches package_publish_flow_changed_files \
assert_matches package_publish_flow_changed_files \
".github/workflows/reusable-package-source-publish.yml" \
".github/workflows/reusable-package-source-publish.yml"
assert_matches package_publish_flow_changed_files \
".github/workflows/verify-integration-batch.yml" \
".github/workflows/verify-integration-batch.yml"
assert_matches package_publish_flow_changed_files \
".github/workflows/finalize-integration-batch.yml" \
".github/workflows/finalize-integration-batch.yml"
assert_not_matches package_publish_flow_changed_files \
"tools/xtask/src/remote_fetch.rs" \
"tools/xtask/src/remote_fetch.rs"
Expand Down Expand Up @@ -233,6 +248,18 @@ assert_matches ci_control_changed_files \
assert_matches ci_control_changed_files \
".github/workflows/recover-rejected-merge-candidate.yml" \
".github/workflows/recover-rejected-merge-candidate.yml"
assert_matches ci_control_changed_files \
".github/workflows/verify-integration-batch.yml" \
".github/workflows/verify-integration-batch.yml"
assert_matches ci_control_changed_files \
".github/workflows/finalize-integration-batch.yml" \
".github/workflows/finalize-integration-batch.yml"
assert_matches ci_control_changed_files \
".github/scripts/finalize-integration-batch.sh" \
".github/scripts/finalize-integration-batch.sh"
assert_matches ci_control_changed_files \
".github/integration-batches/batch-1001.json" \
".github/integration-batches/batch-1001.json"
assert_matches ci_control_changed_files \
".github/scripts/activate-merge-candidate.sh" \
".github/scripts/activate-merge-candidate.sh"
Expand Down
12 changes: 12 additions & 0 deletions .github/integration-batches/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Integration Batch Manifests

Each `batch-<PR>.json` file is an immutable receipt for one integration batch.
The batch may contain unrelated fixes. What it must share is one declared
validation treatment whose required suites are the union of every absorbed
source PR's requirements.

Receipts are append-only. A batch PR adds exactly its own receipt and cannot
change the validation authority that verifies it.

See [`docs/integration-batches.md`](../../docs/integration-batches.md) for the
manifest schema and maintainer workflow.
Loading
Loading