Skip to content

Commit dfc285a

Browse files
committed
Merge main 3080b40 into the ledger ratio metadata fix
Integrate the current main branch after the native CI merge. The merge completed without conflicts; no manual resolutions or extra edits were needed.
2 parents fe5eb7a + 3080b40 commit dfc285a

7 files changed

Lines changed: 1571 additions & 78 deletions

File tree

‎.github/workflows/ci-post.yml‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,38 @@ jobs:
154154
echo "verifier_slow=true" >> "$GITHUB_OUTPUT"
155155
fi
156156
157+
build-x86-gcc133:
158+
needs: [authz]
159+
if: ${{ always() && needs.authz.result == 'success' }}
160+
runs-on: gke-32cpu-64gb-amd64
161+
permissions:
162+
contents: read
163+
steps:
164+
- name: Refuse an unauthorised run before anything else
165+
if: ${{ needs.authz.result != 'success' }}
166+
run: |
167+
echo "::error::authz did not pass; nothing of this run's code is checked out or run"
168+
exit 1
169+
- name: Checkout the exact workflow head
170+
if: ${{ needs.authz.result == 'success' }}
171+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
172+
with:
173+
repository: ${{ github.repository }}
174+
ref: ${{ github.sha }}
175+
fetch-depth: 0
176+
persist-credentials: false
177+
- name: Build native x86 GNU 13.3.0 Release
178+
if: ${{ needs.authz.result == 'success' }}
179+
run: |
180+
python3 scripts/ci_native_x86_release.py --source . --build-dir build-x86-gcc133 --artifact-dir ci-native-x86-gcc133 --jobs "$(getconf _NPROCESSORS_ONLN)"
181+
- name: Retain native x86 GNU 13.3.0 build artifacts
182+
if: always()
183+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
184+
with:
185+
name: ci-post-native-x86-gcc133
186+
path: ci-native-x86-gcc133/
187+
if-no-files-found: warn
188+
157189
preflight:
158190
needs: [authz, changes]
159191
if: ${{ always() && needs.authz.result == 'success' }}
@@ -728,7 +760,7 @@ jobs:
728760
# maintainers, rather than this build context.
729761
build-gate:
730762
name: build
731-
needs: [authz, changes, preflight, build, build-debug, build-release-gate, build-debug-gate, build-arm, sanitizers, sanitizers-gate, native-live, kernel-only, kernel-only-gate, corpus-parity-subset, preflight-slow, corpus-parity]
763+
needs: [authz, changes, preflight, build, build-debug, build-release-gate, build-debug-gate, build-arm, build-x86-gcc133, sanitizers, sanitizers-gate, native-live, kernel-only, kernel-only-gate, corpus-parity-subset, preflight-slow, corpus-parity]
732764
if: always()
733765
# The aggregate runs inline Python and shell on the light pool class.
734766
runs-on: gke-2cpu-4gb-amd64
@@ -749,6 +781,7 @@ jobs:
749781
CHANGES_RESULT: ${{ needs.changes.result }}
750782
DOCS_ONLY: ${{ needs.changes.outputs.docs_only }}
751783
PREFLIGHT_RESULT: ${{ needs.preflight.result }}
784+
X86_GCC133_RESULT: ${{ needs.build-x86-gcc133.result }}
752785
BUILD_RESULT: ${{ needs.build.result }}
753786
DEBUG_BUILD_RESULT: ${{ needs.build-debug.result }}
754787
RELEASE_GATE_RESULT: ${{ needs.build-release-gate.result }}
@@ -765,6 +798,7 @@ jobs:
765798
run: |
766799
printf '%s\n' "authz: $AUTHZ_RESULT" "changes: $CHANGES_RESULT, docs only: ${DOCS_ONLY:-unanswered}" \
767800
"preflight: $PREFLIGHT_RESULT" "matrix: $BUILD_RESULT" \
801+
"native x86 GNU 13.3.0: $X86_GCC133_RESULT" \
768802
"debug shards: $DEBUG_BUILD_RESULT" "release aggregate: $RELEASE_GATE_RESULT" "debug aggregate: $DEBUG_GATE_RESULT" \
769803
"arm64 matrix: $ARM_BUILD_RESULT" \
770804
"sanitizers: $SANITIZER_RESULT" "native: $NATIVE_RESULT" \
@@ -778,7 +812,8 @@ jobs:
778812
if [[ "$CHANGES_RESULT" == "success" && "$DOCS_ONLY" == "true" ]]; then docs_only=true; fi
779813
passed() { [[ "$1" == "success" || ( "$docs_only" == "true" && "$1" == "skipped" ) ]]; }
780814
[[ "$AUTHZ_RESULT" == "success" && "$CHANGES_RESULT" == "success" ]] \
781-
&& [[ "$PREFLIGHT_RESULT" == "success" ]] && passed "$BUILD_RESULT" \
815+
&& [[ "$PREFLIGHT_RESULT" == "success" ]] \
816+
&& [[ "$X86_GCC133_RESULT" == "success" ]] && passed "$BUILD_RESULT" \
782817
&& passed "$DEBUG_BUILD_RESULT" && passed "$RELEASE_GATE_RESULT" && passed "$DEBUG_GATE_RESULT" \
783818
&& passed "$ARM_BUILD_RESULT" \
784819
&& passed "$SANITIZER_RESULT" && passed "$NATIVE_RESULT" \

‎.github/workflows/gke-pr.yml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,30 @@ jobs:
282282
TIER: ${{ (needs.admit.outputs.docs_only == 'true' || needs.admit.outputs.github_only == 'true') && 'github-only' || 'fast' }}
283283
run: python3 scripts/ci_preflight.py --output-dir build-ci-preflight --tier "$TIER"
284284

285+
build-x86-gcc133:
286+
needs: [admit]
287+
if: ${{ needs.admit.outputs.allowed == 'true' }}
288+
runs-on: gke-32cpu-64gb-amd64
289+
permissions: {contents: read}
290+
steps:
291+
- name: Checkout the admitted head
292+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
293+
with:
294+
repository: ${{ github.repository }}
295+
ref: ${{ needs.admit.outputs.head_sha }}
296+
fetch-depth: 0
297+
persist-credentials: false
298+
- name: Build native x86 GNU 13.3.0 Release
299+
run: |
300+
python3 scripts/ci_native_x86_release.py --source . --build-dir build-x86-gcc133 --artifact-dir ci-native-x86-gcc133 --jobs "$(getconf _NPROCESSORS_ONLN)"
301+
- name: Retain native x86 GNU 13.3.0 build artifacts
302+
if: always()
303+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
304+
with:
305+
name: gke-pr-native-x86-gcc133
306+
path: ci-native-x86-gcc133/
307+
if-no-files-found: warn
308+
285309
build:
286310
needs: [admit]
287311
if: ${{ needs.admit.outputs.allowed == 'true' && needs.admit.outputs.docs_only != 'true' && needs.admit.outputs.github_only != 'true' }}
@@ -425,7 +449,7 @@ jobs:
425449
if-no-files-found: warn
426450

427451
legs:
428-
needs: [admit, build, build-debug, build-arm, corpus-parity-subset]
452+
needs: [admit, build, build-debug, build-arm, build-x86-gcc133, corpus-parity-subset]
429453
if: ${{ always() && needs.admit.outputs.allowed == 'true' && needs.admit.outputs.docs_only != 'true' && needs.admit.outputs.github_only != 'true' }}
430454
runs-on: ubuntu-24.04
431455
permissions: {}
@@ -435,6 +459,7 @@ jobs:
435459
BUILD_RESULT: ${{ needs.build.result }}
436460
DEBUG_RESULT: ${{ needs.build-debug.result }}
437461
ARM_RESULT: ${{ needs.build-arm.result }}
462+
X86_RESULT: ${{ needs.build-x86-gcc133.result }}
438463
ARM_RELEVANT: ${{ needs.admit.outputs.arm_relevant }}
439464
PARITY_RESULT: ${{ needs.corpus-parity-subset.result }}
440465
run: |
@@ -448,10 +473,11 @@ jobs:
448473
test "$BUILD_RESULT" = success
449474
test "$DEBUG_RESULT" = success
450475
arm_passed "$ARM_RELEVANT" "$ARM_RESULT"
476+
test "$X86_RESULT" = success
451477
test "$PARITY_RESULT" = success
452478
453479
result:
454-
needs: [admit, preflight, legs]
480+
needs: [admit, preflight, build-x86-gcc133, legs]
455481
if: always()
456482
runs-on: ubuntu-24.04
457483
permissions: {contents: read}
@@ -542,6 +568,7 @@ jobs:
542568
ADMIT_RESULT: ${{ needs.admit.result }}
543569
ALLOWED: ${{ needs.admit.outputs.allowed }}
544570
PREFLIGHT_RESULT: ${{ needs.preflight.result }}
571+
X86_RESULT: ${{ needs.build-x86-gcc133.result }}
545572
LEGS_RESULT: ${{ needs.legs.result }}
546573
ADMIT_DOCS_ONLY: ${{ needs.admit.outputs.docs_only }}
547574
ADMIT_GITHUB_ONLY: ${{ needs.admit.outputs.github_only }}
@@ -556,6 +583,7 @@ jobs:
556583
test "$ADMIT_RESULT" = success || fail "admission refused"
557584
test "$ALLOWED" = true || fail "admission did not allow the head"
558585
test "$PREFLIGHT_RESULT" = success || fail "preflight did not pass"
586+
test "$X86_RESULT" = success || fail "native x86 GNU 13.3.0 build did not pass"
559587
test "$SECOND_DOCS_ONLY" = "$ADMIT_DOCS_ONLY" || fail "docs-only classification changed"
560588
test "$SECOND_GITHUB_ONLY" = "$ADMIT_GITHUB_ONLY" || fail "github-only classification changed"
561589
test "$SECOND_ARM_RELEVANT" = "$ADMIT_ARM_RELEVANT" || fail "arm relevance classification changed"

‎docs/ci.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ The current PR admission and post-merge trigger map is:
66
| --- | --- | --- | --- |
77
| `ci.yml authz` | Hosted authorization context | Hosted authorization context | Not triggered |
88
| `gke-pr / admit` | Hosted admission and main-tree rule check | Hosted admission and main-tree rule check | Not triggered |
9-
| `gke-pr / preflight` | GKE preflight, tiered by the main classifier | GKE github-only preflight | Not triggered |
9+
| `gke-pr / preflight`, `gke-pr / build-x86-gcc133` | GKE preflight, tiered by the main classifier; native x86 GNU 13.3.0 full Release build | GKE github-only preflight; native x86 GNU 13.3.0 full Release build | Not triggered |
1010
| `gke-pr / build`, `build-debug`, parity subset | GKE proof legs for code changes | Skipped | Not triggered |
11-
| `gke-pr / result` | Hosted result with a second classification read | Hosted result with a second classification read | Not triggered |
12-
| `ci-post.yml` proof jobs | Not triggered | Not triggered | Complete Release, Debug, native, kernel and parity profiles |
11+
| `gke-pr / result` | Hosted result with a second classification read and required x86 build | Hosted result with a second classification read and required x86 build | Not triggered |
12+
| `ci-post.yml` proof jobs | Not triggered | Not triggered | Complete Release, Debug, native, kernel and parity profiles plus the required x86 build |
1313
| `corpus-parity.yml` | Not triggered | Not triggered | Full parity and its post-merge subset |
1414
| `docs.yml` | Documentation build except `.github/**`-only changes | Skipped by its path filter | Documentation build on its own trigger |
1515
| `gke-pr / build-arm` | GKE arm64 Debug build and tests when `arm_relevant=true` | Skipped | Not triggered |
1616

1717
The admission workflow is defined on `main` and is selected by the protected
1818
GKE runner group. Its proof legs use the same fixed Release, Debug and parity
1919
runner sizes as the post workflow; the hosted result is red for refusal,
20-
failure, cancellation, disagreement or an unanswered class.
20+
failure, cancellation, disagreement or an unanswered class. The native x86 GNU 13.3.0 job runs for every admitted PR and every post event, including documentation-only and GitHub-only changes: it checks out the exact head, configures a fresh C++17 Release tree with the source layer enabled and optional targets and tests disabled, then invokes the ordinary all-target Unix Makefiles build with the runner's parallelism, and retains the configure and build logs, the compiler identity, CMake cache and compile commands as failure diagnostics.
2121

2222
The nightly CI schedule is 01:30 UTC. The existing docs-only classification
23-
still skips proof jobs on a documentation-only PR or main push. Both
23+
still skips the existing code proof jobs on a documentation-only PR or main push; the native x86 build remains required. Both
2424
preflight tiers together retain the original full stage inventory; the slow
2525
tier still runs on a docs-only main push. Scheduled and manual runs execute
2626
every profile. `ci.yml` retains authorization and draft event handling;
@@ -87,7 +87,7 @@ Post Release/Debug/kernel, native shards and post sanitizers use fixed bare GKE
8787
The two native-live sanitizer profiles use an exact runner matrix. All GKE jobs run directly in runner pods carrying the engine toolchain image and sudo. No job routes by event.
8888
Hosted `ubuntu-24.04` runs PR `authz`, admission, `legs` and `result` jobs, and `docs.yml`'s `build`; secret-free post guards and aggregates use bare scalar GKE names. These light, secret-free jobs need no VM-only tools, mounts or caches.
8989
The seven `ci-post.yml` light jobs use `gke-2cpu-4gb-amd64`; called parity/native light jobs use `gke-4cpu-8gb-amd64` to satisfy the per-label cap, without a weight claim.
90-
Local reusable calls cannot mix PR and GKE jobs. The full post call graph expands to 36 GKE job instances: amd64 32 CPU default/256 GB labels carry 4/4 jobs, amd64 16 CPU default/128/256 GB labels carry 3/3/1, amd64 8/4/2 CPU labels carry 7/5/7, and arm64 16 CPU 128 GB carries 2; each label's static cap is 8.
90+
Local reusable calls cannot mix PR and GKE jobs. The full post call graph expands to 37 GKE job instances: amd64 32 CPU default/256 GB labels carry 5/4 jobs, amd64 16 CPU default/128/256 GB labels carry 3/3/1, amd64 8/4/2 CPU labels carry 7/5/7, and arm64 16 CPU 128 GB carries 2; each label's static cap is 8.
9191

9292
The manual `release-ruleset-probe.yml` workflow runs `authz` on
9393
bare scalar `gke-2cpu-4gb-amd64` and `probe` on `gkp-2cpu-4gb-amd64`.

0 commit comments

Comments
 (0)