You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 41f08d2
Browse filesBrowse the repository at this point in the historyBrowse files
Merge main aff553b into the #742 branch
without rebasing or force-updating it. Keep the complete #743 main delta.
Conflict resolutions:
- scripts/ci_preflight.py: keep #742's NATIVE_X86_JOB mapping to the spot
32CPU label while retaining main's on-demand build and sanitizer labels.
- scripts/test_ci_preflight.py: keep the matching NATIVE_X86_JOB expectation
and main's on-demand build and sanitizer expectations.
All other main hunks are retained, including the workflow, allowlist, docs,
rerun-controller, release-gate, and rerun-preempted changes.
Copy file name to clipboardExpand all lines: docs/ci.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -35,7 +35,7 @@ Missing logs, mixed failures, arm64/`gkp-*` jobs, stale attempts and changed run
35
35
refuse the retry; three total attempts are allowed. PRs, manual dispatches and
36
36
release/publish/deploy/promotion workflows are excluded. The controller runs on
37
37
hosted `ubuntu-24.04`, uses its trusted default-branch workflow commit, and never
38
-
prints log bodies. Missing `gh`, `python3` or the log escape flag fails the job.
38
+
prints log bodies. Missing `gh`, `python3` or the log escape flag fails the job. The post-merge on-demand amd64 labels are included in the same loss-retry fleet; if that routing is rolled back, land a revert PR for the label commit before the next post-merge run.
39
39
40
40
A GitHub-only PR changes at least one path, all under `.github/`, including both sides of a rename.
41
41
`scripts/ci_*.py` changes, alone or mixed with `.github/`, follow the ordinary proof plan.
@@ -1642,7 +1642,7 @@ The native matrix is exactly `1..4` with `--ctest-shard I/4`; live sanitizers ar
1642
1642
|`gke-pr.yml`|`pull_request_target` to `main`| Hosted admission/result; GKE preflight and proof legs; Debug `gke-16cpu-32gb-amd64-128gb`, arm64 `gke-16cpu-32gb-arm64-128gb`|
1643
1643
|`docs.yml`|`pull_request`, except `.github/**`-only diffs |`authz` and `build`: hosted `ubuntu-24.04`|
1644
1644
|`rerun-preempted.yml`|`workflow_run`: completed `CI post-merge` push/schedule runs on `main`|`rerun`: hosted `ubuntu-24.04`|
1645
-
|`ci-post.yml`| Push to `main`, 01:30 UTC schedule, dispatch | Seven light jobs: scalar `gke-2cpu-4gb-amd64`; bare GKE scalars: Release `gke-32cpu-64gb-amd64`, sanitizers `gke-32cpu-64gb-amd64-256gb`, Debug `gke-16cpu-32gb-amd64-128gb`, kernel `gke-16cpu-32gb-amd64`, preflight tiers `gke-8cpu-16gb-amd64`, arm64 `gke-16cpu-32gb-arm64-128gb`|
1645
+
|`ci-post.yml`| Push to `main`, 01:30 UTC schedule, dispatch | Seven light jobs: scalar `gke-2cpu-4gb-amd64`; bare GKE scalars: Release `gke-ondemand-32cpu-64gb-amd64`, sanitizers `gke-ondemand-32cpu-64gb-amd64-256gb`, Debug `gke-16cpu-32gb-amd64-128gb`, kernel `gke-16cpu-32gb-amd64`, preflight tiers `gke-8cpu-16gb-amd64`, arm64 `gke-16cpu-32gb-arm64-128gb`|
1646
1646
|`corpus-parity.yml`| Schedule, dispatch, post CI callers |`authz`: scalar `gke-4cpu-8gb-amd64`; bare GKE scalars: full parity `gke-16cpu-32gb-amd64`, subset `gke-8cpu-16gb-amd64`|
1647
1647
|`native-live.yml`| Dispatch and post CI callers on `main`|`authz` and both aggregates: scalar `gke-4cpu-8gb-amd64`; native shards: bare `gke-8cpu-16gb-amd64`; `matrix.runner`: live-sanitizers `gke-16cpu-32gb-amd64-256gb`, live-tsan `gke-16cpu-32gb-amd64-128gb`|
0 commit comments