Skip to content

Commit 1c150a3

Browse files
luisleo526claude
andcommitted
ci: drop the macOS test legs and the macOS release slice; add Linux arm64 test legs
Tests no longer run on macOS, and the release stops building and publishing a macOS archive. Linux x86_64 and arm64 are the supported platforms. - ci-post.yml: remove job build-macos. Add job build-arm (hosted ubuntu-24.04-arm, Release and Debug) that runs the same verification steps as job build; the aggregate build job now requires both. A preflight check keeps the two jobs' steps identical. - release.yml: remove the macos-universal matrix slice, its Eigen step, the extra CMake flags it used and the shasum fallback; the release notes name the Linux archives. - ci_release_gate.py: the required post-merge legs are build (ubuntu-24.04, Release|Debug) and build (ubuntu-24.04-arm, Release|Debug), derived from one constant. A run missing any of the four is refused; a run with no macOS leg is accepted. - ci_preflight.py and its tests: pin the new job and matrix, drop every macOS pin, and refuse a macOS step in the release prebuilt job. New rows cover a leftover macOS job, a gate that does not need build-arm, an arm job on a non-arm runner, a missing build_type cell, and the gate's missing-leg and macOS-absent cases. - ci.yml and docs/ci.md: comments and sentences that named macOS legs. Not run on the author's machine. Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
1 parent fd7013e commit 1c150a3

8 files changed

Lines changed: 392 additions & 220 deletions

File tree

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

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ env:
3232
PINEFORGE_REQUIRE_RELEASE_TAGS: "1"
3333

3434
# The canon authz gate admits our events before any checkout. Light jobs
35-
# (authz, changes, build-gate) use hosted ubuntu-24.04; Linux proofs use the
36-
# post-merge fleet, and macOS uses hosted macos-26. Runner pins are checked
35+
# (authz, changes, build-gate) use hosted ubuntu-24.04; amd64 proofs use the
36+
# post-merge fleet, and arm64 builds use hosted ubuntu-24.04-arm. Runner pins are checked
3737
# by scripts/ci_preflight.py.
3838
# Each verification sizes its parallelism to the runner that took it.
3939
# scripts/ci_preflight.py pins every runner, time limit and job count; every
@@ -283,8 +283,8 @@ jobs:
283283
ACTUAL_OS: ${{ runner.os }}
284284
run: |
285285
case "$REQUESTED_PLATFORM:$ACTUAL_OS" in
286-
ubuntu-24.04:Linux|macos-26:macOS) ;;
287-
*) echo "::error::post fleet runner OS $ACTUAL_OS cannot verify $REQUESTED_PLATFORM"; exit 1 ;;
286+
ubuntu-24.04:Linux) ;;
287+
*) echo "::error::runner OS $ACTUAL_OS cannot verify $REQUESTED_PLATFORM"; exit 1 ;;
288288
esac
289289
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
290290
if: ${{ needs.authz.result == 'success' }}
@@ -329,10 +329,9 @@ jobs:
329329
# debug registers a subset of those rows.
330330
- name: Verify (${{ matrix.build_type }})
331331
env:
332-
# A40 rev 7: the relative runtime witness gates on process CPU time,
333-
# so every Release lane runs it, hosted macOS included (A40 rev 6 had
334-
# exempted that VM while the gated sample was wall clock). '1' is the
335-
# escape -- the row registers --candidate-only, one sample and no
332+
# The relative runtime witness gates on process CPU time on every
333+
# Release runner. '1' is the escape -- the row registers
334+
# --candidate-only, one sample and no
336335
# ratio -- for a runner whose CPU accounting is unusable; record the
337336
# measured reason here and in docs/ci.md before setting it.
338337
PINEFORGE_RUNTIME_BUDGET_CANDIDATE_ONLY: '0'
@@ -359,18 +358,16 @@ jobs:
359358
path: ${{ env.CCACHE_DIR }}
360359
key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
361360

362-
# LB-535 canon keeps macOS as the sole hosted exception in engine/app.
363-
# pf-gcp-post is the Linux fleet, so macOS proof needs a separate hosted job.
364-
build-macos:
365-
name: build (${{ matrix.os }}, ${{ matrix.build_type }})
361+
# Hosted arm64 cells run the same verification steps as the amd64 post fleet.
362+
build-arm:
363+
name: build (ubuntu-24.04-arm, ${{ matrix.build_type }})
366364
needs: [authz, changes]
367365
if: ${{ always() && needs.authz.result == 'success' && (needs.changes.result != 'success' || needs.changes.outputs.docs_only != 'true') }}
368366
strategy:
369367
fail-fast: false
370368
matrix:
371-
os: [macos-26]
372369
build_type: [Release, Debug]
373-
runs-on: macos-26
370+
runs-on: ubuntu-24.04-arm
374371

375372
steps:
376373
- name: Refuse an unauthorised run before anything else
@@ -381,12 +378,12 @@ jobs:
381378
- name: Require the requested platform
382379
if: ${{ needs.authz.result == 'success' }}
383380
env:
384-
REQUESTED_PLATFORM: ${{ matrix.os }}
381+
REQUESTED_PLATFORM: ubuntu-24.04-arm
385382
ACTUAL_OS: ${{ runner.os }}
386383
run: |
387384
case "$REQUESTED_PLATFORM:$ACTUAL_OS" in
388-
ubuntu-24.04:Linux|macos-26:macOS) ;;
389-
*) echo "::error::post fleet runner OS $ACTUAL_OS cannot verify $REQUESTED_PLATFORM"; exit 1 ;;
385+
ubuntu-24.04-arm:Linux) ;;
386+
*) echo "::error::runner OS $ACTUAL_OS cannot verify $REQUESTED_PLATFORM"; exit 1 ;;
390387
esac
391388
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
392389
if: ${{ needs.authz.result == 'success' }}
@@ -406,14 +403,17 @@ jobs:
406403
python3 -m pip install --disable-pip-version-check --no-input \
407404
--require-hashes --only-binary ':all:' -r scripts/requirements-preflight.txt
408405
409-
- name: Install dependencies (macOS)
410-
if: ${{ needs.authz.result == 'success' && runner.os == 'macOS' }}
406+
# tzdata-legacy carries the backward links test_native_calendar resolves
407+
# (US/Eastern, Japan, GB); noble split them out of tzdata, and the hosted
408+
# image happens to have it, so the row stays green on a bare runner too.
409+
- name: Install dependencies (Linux)
410+
if: ${{ needs.authz.result == 'success' && runner.os == 'Linux' }}
411411
run: |
412-
export HOMEBREW_NO_AUTO_UPDATE=1
413-
brew install eigen ccache
414-
echo "CMAKE_PREFIX_PATH=$(brew --prefix eigen)${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}" >> "$GITHUB_ENV"
412+
sudo apt-get update
413+
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libeigen3-dev tzdata-legacy ccache strace
415414
416-
# Keep the main cache namespace shared with PR restores. Only main saves.
415+
# PRs restore the newest compatible main cache via the default-branch
416+
# fallback. Only main writes this namespace, never a PR merge ref.
417417
- name: Restore ccache
418418
id: ccache-restore
419419
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
@@ -423,12 +423,16 @@ jobs:
423423
restore-keys: |
424424
ccache-main-${{ runner.os }}-${{ runner.arch }}-${{ matrix.build_type }}-
425425
426-
# The release profile fails below its CTest row floor; debug registers
427-
# a subset of those rows, just as in the Linux full profiles.
426+
# The release profile fails below its CTest row floor (its row of the
427+
# PRIVATE_FIXTURE_PROFILE_FLOORS table in scripts/ci_verify.py);
428+
# debug registers a subset of those rows.
428429
- name: Verify (${{ matrix.build_type }})
429430
env:
430-
# A40 rev 7 gates the runtime witness on process CPU time on hosted
431-
# macOS too; the candidate-only escape remains disabled.
431+
# The relative runtime witness gates on process CPU time on every
432+
# Release runner. '1' is the escape -- the row registers
433+
# --candidate-only, one sample and no
434+
# ratio -- for a runner whose CPU accounting is unusable; record the
435+
# measured reason here and in docs/ci.md before setting it.
432436
PINEFORGE_RUNTIME_BUDGET_CANDIDATE_ONLY: '0'
433437
if: ${{ needs.authz.result == 'success' }}
434438
run: |
@@ -442,7 +446,7 @@ jobs:
442446
if: always()
443447
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
444448
with:
445-
name: ci-diagnostics-${{ matrix.os }}-${{ matrix.build_type }}
449+
name: ci-diagnostics-ubuntu-24.04-arm-${{ matrix.build_type }}
446450
path: ci-diagnostics/
447451
if-no-files-found: warn
448452

@@ -633,7 +637,7 @@ jobs:
633637
# maintainers, rather than this build context.
634638
build-gate:
635639
name: build
636-
needs: [authz, changes, preflight, build, build-macos, sanitizers, native-live, kernel-only, corpus-parity-subset, preflight-slow, corpus-parity]
640+
needs: [authz, changes, preflight, build, build-arm, sanitizers, native-live, kernel-only, corpus-parity-subset, preflight-slow, corpus-parity]
637641
if: always()
638642
# The aggregate runs inline Python and shell on the light pool class.
639643
runs-on: ubuntu-24.04
@@ -655,7 +659,7 @@ jobs:
655659
DOCS_ONLY: ${{ needs.changes.outputs.docs_only }}
656660
PREFLIGHT_RESULT: ${{ needs.preflight.result }}
657661
BUILD_RESULT: ${{ needs.build.result }}
658-
MACOS_BUILD_RESULT: ${{ needs.build-macos.result }}
662+
ARM_BUILD_RESULT: ${{ needs.build-arm.result }}
659663
SANITIZER_RESULT: ${{ needs.sanitizers.result }}
660664
NATIVE_RESULT: ${{ needs.native-live.result }}
661665
KERNEL_RESULT: ${{ needs.kernel-only.result }}
@@ -665,7 +669,7 @@ jobs:
665669
run: |
666670
printf '%s\n' "authz: $AUTHZ_RESULT" "changes: $CHANGES_RESULT, docs only: ${DOCS_ONLY:-unanswered}" \
667671
"preflight: $PREFLIGHT_RESULT" "matrix: $BUILD_RESULT" \
668-
"macOS matrix: $MACOS_BUILD_RESULT" \
672+
"arm64 matrix: $ARM_BUILD_RESULT" \
669673
"sanitizers: $SANITIZER_RESULT" "native: $NATIVE_RESULT" \
670674
"kernel: $KERNEL_RESULT" "corpus parity (subset): $PARITY_RESULT" \
671675
"preflight (slow): $SLOW_PREFLIGHT_RESULT" "corpus parity (full): $FULL_PARITY_RESULT"
@@ -677,7 +681,7 @@ jobs:
677681
passed() { [[ "$1" == "success" || ( "$docs_only" == "true" && "$1" == "skipped" ) ]]; }
678682
[[ "$AUTHZ_RESULT" == "success" && "$CHANGES_RESULT" == "success" ]] \
679683
&& [[ "$PREFLIGHT_RESULT" == "success" ]] && passed "$BUILD_RESULT" \
680-
&& passed "$MACOS_BUILD_RESULT" \
684+
&& passed "$ARM_BUILD_RESULT" \
681685
&& passed "$SANITIZER_RESULT" && passed "$NATIVE_RESULT" \
682686
&& passed "$KERNEL_RESULT" && passed "$PARITY_RESULT" \
683687
&& [[ "$SLOW_PREFLIGHT_RESULT" == "success" ]] && passed "$FULL_PARITY_RESULT"

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,8 @@ jobs:
345345
- name: Verify (${{ matrix.build_type }})
346346
env:
347347
# A40 rev 7: the relative runtime witness gates on process CPU time,
348-
# so every Release lane runs it, hosted macOS included (A40 rev 6 had
349-
# exempted that VM while the gated sample was wall clock). '1' is the
350-
# escape -- the row registers --candidate-only, one sample and no
348+
# so every Release runner runs it. '1' is the escape -- the row
349+
# registers --candidate-only, one sample and no
351350
# ratio -- for a runner whose CPU accounting is unusable; record the
352351
# measured reason here and in docs/ci.md before setting it.
353352
PINEFORGE_RUNTIME_BUDGET_CANDIDATE_ONLY: '0'

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ jobs:
273273
echo
274274
echo "### Prebuilt libraries"
275275
echo
276-
echo "Per-arch static-lib + headers tarballs are attached below (C ABI)."
276+
echo "Linux amd64 and arm64 static-lib + headers tarballs are attached below (C ABI)."
277277
echo "For the full PineScript -> backtest image, use \`ghcr.io/pineforge-4pass/pineforge-release\`."
278278
echo
279279
echo "### Run-failure codes"
@@ -366,16 +366,8 @@ jobs:
366366
include:
367367
- triple: linux-x86_64
368368
runner: ["self-hosted","pf-gcp-main"]
369-
cmake_extra: ""
370369
- triple: linux-aarch64
371370
runner: ubuntu-22.04-arm
372-
cmake_extra: ""
373-
# Single universal slice covers x86_64 + arm64 macs. macos-13
374-
# (Intel) runner pool is being phased out and queues for >30min;
375-
# cross-build a fat archive on macos-latest (arm64) instead.
376-
- triple: macos-universal
377-
runner: macos-latest
378-
cmake_extra: "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64"
379371
runs-on: ${{ matrix.runner }}
380372

381373
steps:
@@ -432,34 +424,23 @@ jobs:
432424
grep -q 'define EIGEN_MAJOR_VERSION 4' "$macros"
433425
echo "Eigen3 3.4.x present at $(dirname "$(dirname "$hdr")")"
434426
435-
- name: Install Eigen3 (macOS)
436-
if: runner.os == 'macOS'
437-
run: |
438-
brew install eigen
439-
echo "CMAKE_PREFIX_PATH=$(brew --prefix eigen)" >> "$GITHUB_ENV"
440-
441427
- name: Configure
442428
env:
443429
TAG: ${{ needs.release.outputs.tag }}
444430
TRIPLE: ${{ matrix.triple }}
445-
CMAKE_EXTRA: ${{ matrix.cmake_extra }}
446431
run: |
447432
set -euo pipefail
448433
stage="stage/pineforge-${TAG}-${TRIPLE}"
449434
echo "STAGE_DIR=${stage}" >> "$GITHUB_ENV"
450435
# FILE: the version identity is the VERSION file exactly, -rc.N
451436
# included, however the checkout's tags describe it; a dry run's
452437
# VERSION has no tag at all.
453-
# CMAKE_EXTRA is unquoted so multi-flag strings (e.g. mac fat
454-
# archive flag) split into separate argv entries.
455-
# shellcheck disable=SC2086
456438
cmake -B build \
457439
-DCMAKE_BUILD_TYPE=Release \
458440
-DPINEFORGE_BUILD_TESTS=OFF \
459441
-DPINEFORGE_BUILD_TUTORIAL=OFF \
460442
-DPINEFORGE_VERSION_SOURCE=FILE \
461-
-DCMAKE_INSTALL_PREFIX="${PWD}/${stage}" \
462-
${CMAKE_EXTRA}
443+
-DCMAKE_INSTALL_PREFIX="${PWD}/${stage}"
463444
464445
- name: Build
465446
run: cmake --build build -j 4
@@ -491,11 +472,7 @@ jobs:
491472
base="pineforge-${TAG}-${TRIPLE}"
492473
tarball="${base}.tar.gz"
493474
tar -czf "${tarball}" -C stage "${base}"
494-
if command -v sha256sum >/dev/null; then
495-
sha256sum "${tarball}" > "${tarball}.sha256"
496-
else
497-
shasum -a 256 "${tarball}" > "${tarball}.sha256"
498-
fi
475+
sha256sum "${tarball}" > "${tarball}.sha256"
499476
echo "tarball=${tarball}" >> "$GITHUB_OUTPUT"
500477
echo "sha256=${tarball}.sha256" >> "$GITHUB_OUTPUT"
501478

0 commit comments

Comments
 (0)