@@ -57,18 +57,21 @@ jobs:
5757 run : |
5858 # Every CORE leg is tagged with the lane (scripts/ci/select-lanes.sh)
5959 # it serves; the tag is what lane selection filters on below.
60+ # The lane names unix-macos14 and tsan-mac are kept as lane keys
61+ # (select-lanes.sh, ci-ok and the lane contracts key on them); both
62+ # run on macos-15 because GitHub retires the macos-14 image on 2026-11-02.
6063 CORE_UNIX='[
6164 {"os":"ubuntu-latest","cc":"gcc","cxx":"g++","lane":"unix-x86"},
6265 {"os":"ubuntu-24.04-arm","cc":"gcc","cxx":"g++","lane":"unix-arm64"},
63- {"os":"macos-14 ","cc":"cc","cxx":"c++","lane":"unix-macos14"},
66+ {"os":"macos-15 ","cc":"cc","cxx":"c++","lane":"unix-macos14"},
6467 {"os":"macos-15-intel","cc":"cc","cxx":"c++","lane":"unix-macos-intel"}
6568 ]'
6669 # Broad matrix legs are REQUIRED gates (no optional/continue-on-error
6770 # escape hatches): the release dry run must be all-green, every platform.
71+ # macos-15 is the CORE macOS arm64 leg now, so it is not repeated here.
6872 BROAD_UNIX='[
6973 {"os":"ubuntu-22.04","cc":"gcc","cxx":"g++"},
70- {"os":"ubuntu-22.04-arm","cc":"gcc","cxx":"g++"},
71- {"os":"macos-15","cc":"cc","cxx":"c++"}
74+ {"os":"ubuntu-22.04-arm","cc":"gcc","cxx":"g++"}
7275 ]'
7376 # Each Windows leg pins the msys2 environment + package arch to the
7477 # RUNNER architecture so the build is native, never emulated:
9295 TSAN='[
9396 {"os":"ubuntu-latest","cc":"clang","cxx":"clang++","lane":"tsan-x86"},
9497 {"os":"ubuntu-24.04-arm","cc":"clang","cxx":"clang++","lane":"tsan-arm"},
95- {"os":"macos-14 ","cc":"cc","cxx":"c++","lane":"tsan-mac"}
98+ {"os":"macos-15 ","cc":"cc","cxx":"c++","lane":"tsan-mac"}
9699 ]'
97100 # Lane selection. "all" (dry run, release) keeps every leg and drops
98101 # the tags, so those matrices -- and their job names -- stay exactly
@@ -166,7 +169,8 @@ jobs:
166169
167170 - name : Install deps (Ubuntu)
168171 if : startsWith(matrix.os, 'ubuntu')
169- run : sudo apt-get update && sudo apt-get install -y zlib1g-dev ccache
172+ timeout-minutes : 10
173+ run : APT_RETRIES=3; [ -f /etc/apt/apt-mirrors.txt ] && APT_RETRIES=0; sudo apt-get -o Acquire::Retries=$APT_RETRIES -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 --error-on=any update && sudo apt-get -o Acquire::Retries=$APT_RETRIES -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 install -y zlib1g-dev ccache
170174
171175 # Ubuntu 23.10+ ships kernel.apparmor_restrict_unprivileged_userns=1, which
172176 # blocks unshare(CLONE_NEWUSER) for unprivileged users. Without this, the
@@ -367,14 +371,16 @@ jobs:
367371 - uses : actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
368372
369373 - name : Install deps
370- run : sudo apt-get update && sudo apt-get install -y zlib1g-dev ccache
374+ timeout-minutes : 10
375+ run : APT_RETRIES=3; [ -f /etc/apt/apt-mirrors.txt ] && APT_RETRIES=0; sudo apt-get -o Acquire::Retries=$APT_RETRIES -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 --error-on=any update && sudo apt-get -o Acquire::Retries=$APT_RETRIES -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 install -y zlib1g-dev ccache
371376
372377 - name : Install LLVM 21 (pinned diagnostic toolchain)
378+ timeout-minutes : 10
373379 run : |
374380 wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
375381 echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main" | sudo tee /etc/apt/sources.list.d/llvm-21.list
376- sudo apt-get update
377- sudo apt-get install -y clang-21
382+ APT_RETRIES=3; [ -f /etc/apt/apt-mirrors.txt ] && APT_RETRIES=0; sudo apt-get -o Acquire::Retries=$APT_RETRIES -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 --error-on=any update
383+ sudo apt-get -o Acquire::Retries=$APT_RETRIES -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 install -y clang-21
378384
379385 - name : Compiler cache (content-verified, restore)
380386 uses : actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
@@ -525,7 +531,8 @@ jobs:
525531
526532 - name : Install deps (Ubuntu)
527533 if : runner.os == 'Linux'
528- run : sudo apt-get update && sudo apt-get install -y clang zlib1g-dev ccache
534+ timeout-minutes : 10
535+ run : APT_RETRIES=3; [ -f /etc/apt/apt-mirrors.txt ] && APT_RETRIES=0; sudo apt-get -o Acquire::Retries=$APT_RETRIES -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 --error-on=any update && sudo apt-get -o Acquire::Retries=$APT_RETRIES -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 install -y clang zlib1g-dev ccache
529536
530537 - name : Install deps (macOS)
531538 if : runner.os == 'macOS'
0 commit comments