Skip to content

Commit f6100d9

Browse files
committed
Merge origin/main into fix/swift-init-extraction
Signed-off-by: Martin Vogel <[email protected]>
2 parents ca1f750 + 9f0fdcb commit f6100d9

26 files changed

Lines changed: 1429 additions & 70 deletions

‎.github/workflows/_build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ jobs:
4141
goarch: arm64
4242
cc: gcc
4343
cxx: g++
44-
- os: macos-14
44+
# The macOS minimum (14.0) is pinned in Makefile.cbm, not inherited
45+
# from this runner's SDK, so both darwin binaries still start on macOS 14.
46+
- os: macos-15
4547
goos: darwin
4648
goarch: arm64
4749
cc: cc

‎.github/workflows/_memwaste.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115

116116
event-macos:
117117
if: ${{ inputs.mode == 'full' }}
118-
runs-on: macos-14
118+
runs-on: macos-15
119119
timeout-minutes: 60
120120
steps:
121121
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

‎.github/workflows/_smoke.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
CORE_UNIX='[
3434
{"os":"ubuntu-latest","goos":"linux","goarch":"amd64"},
3535
{"os":"ubuntu-24.04-arm","goos":"linux","goarch":"arm64"},
36-
{"os":"macos-14","goos":"darwin","goarch":"arm64"},
36+
{"os":"macos-15","goos":"darwin","goarch":"arm64"},
3737
{"os":"macos-15-intel","goos":"darwin","goarch":"amd64"}
3838
]'
3939
# Broad legs reuse existing goos/goarch artifacts on additional OS
@@ -47,9 +47,10 @@ jobs:
4747
# (ubuntu-22.04 / 22.04-arm). So the dynamic broad legs stay on
4848
# forward-compatible OSes only (macOS); running the dynamic binary on
4949
# ubuntu-22.04 would fail Phase 1 (glibc too old), not a real regression.
50-
BROAD_UNIX='[
51-
{"os":"macos-15","goos":"darwin","goarch":"arm64"}
52-
]'
50+
# Empty since the move off macos-14 (retired 2026-11-02): the darwin-arm64
51+
# artifact is now built AND smoked on macos-15, the core leg, which was
52+
# this broad leg.
53+
BROAD_UNIX='[]'
5354
CORE_WIN='[{"os":"windows-latest","arch":"amd64"}]'
5455
# windows-11-arm now runs the NATIVE arm64 binary (build-windows-arm64),
5556
# not the x86_64 binary under emulation — we smoke the artifact we ship.

‎.github/workflows/_soak.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
goarch: arm64
4545
cc: gcc
4646
cxx: g++
47-
- os: macos-14
47+
- os: macos-15
4848
goos: darwin
4949
goarch: arm64
5050
cc: cc
@@ -335,7 +335,7 @@ jobs:
335335
goarch: arm64
336336
cc: gcc
337337
cxx: g++
338-
- os: macos-14
338+
- os: macos-15
339339
goos: darwin
340340
goarch: arm64
341341
cc: cc

‎.github/workflows/_test.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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:
@@ -92,7 +95,7 @@ jobs:
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

‎.github/workflows/bug-repro.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
group: linux
4141
cc: gcc
4242
cxx: g++
43-
- os: macos-14
43+
- os: macos-15
4444
group: macos
4545
cc: cc
4646
cxx: c++

‎.github/workflows/cache-warm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
include:
2828
- { os: ubuntu-latest, cc: gcc, cxx: g++ }
2929
- { os: ubuntu-24.04-arm, cc: gcc, cxx: g++ }
30-
- { os: macos-14, cc: cc, cxx: c++ }
30+
- { os: macos-15, cc: cc, cxx: c++ }
3131
- { os: macos-15-intel, cc: cc, cxx: c++ }
3232
runs-on: ${{ matrix.os }}
3333
timeout-minutes: 60

‎.github/workflows/pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
cat "$RUNNER_TEMP/selection.txt" >> "$GITHUB_OUTPUT"
176176
# pr-smoke's legs, each tagged with its lane (kept in the job name,
177177
# where ci-ok reads it back); the job gets the selected ones.
178-
SMOKE='[{"os":"ubuntu-latest","lane":"smoke-ubuntu"},{"os":"macos-14","lane":"smoke-mac"},{"os":"windows-latest","lane":"smoke-win"}]'
178+
SMOKE='[{"os":"ubuntu-latest","lane":"smoke-ubuntu"},{"os":"macos-15","lane":"smoke-mac"},{"os":"windows-latest","lane":"smoke-win"}]'
179179
LANES=$(sed -n 's/^lanes=//p' "$RUNNER_TEMP/selection.txt")
180180
echo "smoke={\"include\":$(jq -c --argjson sel "$LANES" 'map(select(.lane | IN($sel[])))' <<< "$SMOKE")}" >> "$GITHUB_OUTPUT"
181181
# The CodeQL legs, tagged the same way (codeql.yml's full matrix has
@@ -214,7 +214,7 @@ jobs:
214214
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev ccache
215215

216216
- name: Install ccache (macOS)
217-
if: matrix.os == 'macos-14'
217+
if: matrix.os == 'macos-15'
218218
run: command -v ccache >/dev/null 2>&1 || brew install ccache
219219

220220
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
@@ -254,7 +254,7 @@ jobs:
254254
SMOKE_REQUIRE_WRAPPERS: "1"
255255

256256
- name: Build prod + smoke (macOS)
257-
if: matrix.os == 'macos-14'
257+
if: matrix.os == 'macos-15'
258258
run: |
259259
scripts/build.sh CC=cc CXX=c++
260260
codesign --sign - --force build/c/codebase-memory-mcp

‎.github/workflows/smoke.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ jobs:
3939
- os: ubuntu-24.04-arm
4040
cc: gcc
4141
cxx: g++
42-
- os: macos-14 # arm64
43-
cc: cc
44-
cxx: c++
4542
- os: macos-15 # arm64
4643
cc: cc
4744
cxx: c++

‎Makefile.cbm‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,24 @@
1818
# that use their own *_CFLAGS — and so it survives a command-line `CC=` override.
1919
# ARCHFLAGS is empty on Linux/Windows and for native direct `make` invocations,
2020
# leaving CC/CXX unchanged there.
21-
override CC := $(CC) $(ARCHFLAGS)
22-
override CXX := $(CXX) $(ARCHFLAGS)
21+
#
22+
# Minimum macOS version (Apple targets only). Without one, clang takes the
23+
# minimum from the SDK it compiles against (LC_BUILD_VERSION minos), so a
24+
# release built on a macos-15 runner would refuse to start on macOS 14. 14.0
25+
# keeps every macOS that could run a release built on the macos-14 runner
26+
# (retired 2026-11-02). A flag folded into the drivers like ARCHFLAGS, not an
27+
# exported MACOSX_DEPLOYMENT_TARGET: it reaches every compile AND link on every
28+
# build path (build.sh, test.sh, direct make) and is part of each command line.
29+
# Detected from the compiler's target, not the host, so a cross compiler run
30+
# on a Mac is left untouched.
31+
MACOS_MIN_VERSION := 14.0
32+
IS_APPLE_TARGET := $(shell echo | $(CC) $(ARCHFLAGS) -dM -E - 2>/dev/null | grep -q '__APPLE__' && echo yes || echo no)
33+
MACOS_MIN_FLAGS :=
34+
ifeq ($(IS_APPLE_TARGET),yes)
35+
MACOS_MIN_FLAGS := -mmacosx-version-min=$(MACOS_MIN_VERSION)
36+
endif
37+
override CC := $(CC) $(ARCHFLAGS) $(MACOS_MIN_FLAGS)
38+
override CXX := $(CXX) $(ARCHFLAGS) $(MACOS_MIN_FLAGS)
2339

2440
# ── Common flags ─────────────────────────────────────────────────
2541

0 commit comments

Comments
 (0)