Skip to content

Commit c96da7c

Browse files
committed
ci: musl toolchain references 15.1.0 -> 16.1.0 (assertions + installs)
The anchor-removal build actually succeeded (Resolved gcc@16.1.0-musl); the red came from ci-linux's hardcoded 'Resolved gcc@15.1.0-musl' assertion. Update every musl 15.1.0 reference across workflows.
1 parent 2685186 commit c96da7c

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ci-fresh-install.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ concurrency:
3333

3434
jobs:
3535
# ──────────────────────────────────────────────────────────────────
36-
# Linux: gcc@16.1.0, musl-gcc@15.1.0, llvm@20.1.7
36+
# Linux: gcc@16.1.0, musl-gcc@16.1.0, llvm@20.1.7
3737
# ──────────────────────────────────────────────────────────────────
3838
# A4: post-release runs race the xim-pkgindex bump (a PR a maintainer
3939
# merges asynchronously) — the 0.0.85 fresh-install failed with
@@ -120,16 +120,16 @@ jobs:
120120
121121
- name: "musl-gcc: mcpp new → run"
122122
run: |
123-
mcpp toolchain install gcc 15.1.0-musl
124-
mcpp toolchain default gcc@15.1.0-musl
123+
mcpp toolchain install gcc 16.1.0-musl
124+
mcpp toolchain default gcc@16.1.0-musl
125125
cd "$(mktemp -d)"
126126
mcpp new hello_musl
127127
cd hello_musl
128128
mcpp run
129129
130130
- name: "musl-gcc: build mcpp"
131131
run: |
132-
mcpp toolchain default gcc@15.1.0-musl
132+
mcpp toolchain default gcc@16.1.0-musl
133133
mcpp clean
134134
mcpp run
135135

.github/workflows/ci-linux-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
# deterministic GNU answer instead of an auto-install pick.
116116
"$MCPP" toolchain default gcc@16.1.0
117117
# Warm musl once so fresh-home e2e tests inherit the payload.
118-
"$MCPP" toolchain install gcc 15.1.0-musl
118+
"$MCPP" toolchain install gcc 16.1.0-musl
119119
bash tests/e2e/run_all.sh
120120
121121
# ──────────────────────────────────────────────────────────────────

.github/workflows/ci-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
# longer relies on e2e's toolchain warm-ups: the GCC build uses the
122122
# mcpp.toml-pinned default (gcc@16.1.0, already in the sandbox from the
123123
# self-host build above), and the musl `--target` build auto-installs
124-
# gcc@15.1.0-musl on demand (cached across runs).
124+
# gcc@16.1.0-musl on demand (cached across runs).
125125

126126
- name: Save freshly-built mcpp for toolchain tests
127127
run: |
@@ -138,7 +138,7 @@ jobs:
138138
- name: "Toolchain: musl-gcc — build mcpp (--target)"
139139
run: |
140140
"$MCPP" clean
141-
"$MCPP" build --target x86_64-linux-musl 2>&1 | tee build.log; grep -q "Resolved gcc@15.1.0-musl" build.log
141+
"$MCPP" build --target x86_64-linux-musl 2>&1 | tee build.log; grep -q "Resolved gcc@16.1.0-musl" build.log
142142
143143
- name: "Toolchain: LLVM — build mcpp"
144144
run: |

mcpp.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ macos = "llvm@22.1.8"
2222
windows = "llvm@20.1.7"
2323

2424
# Per-target overrides: `mcpp build --target x86_64-linux-musl` (or the
25-
# four-segment form `x86_64-unknown-linux-musl`) picks musl-gcc 15.1 + full
25+
# four-segment form `x86_64-unknown-linux-musl`) picks musl-gcc 16.1 + full
2626
# static linkage. Used by .github/workflows/release.yml to produce a
2727
# portable static binary that drops in anywhere with no ELF interp / RUNPATH
2828
# baggage.

0 commit comments

Comments
 (0)