Skip to content

Commit 9144db3

Browse files
committed
ci: each platform's every toolchain builds mcpp itself
Merge redundant self-host smoke steps into unified toolchain steps. Each supported toolchain per platform does: clean → build mcpp → verify. Linux: gcc@16.1.0 (+ test), musl-gcc@15.1.0, llvm@20.1.7 macOS: llvm@20.1.7 Windows: llvm@20.1.7
1 parent 97505d6 commit 9144db3

3 files changed

Lines changed: 7 additions & 21 deletions

File tree

.github/workflows/ci-macos.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,14 +306,12 @@ jobs:
306306
"$MCPP" toolchain default llvm@20.1.7
307307
bash tests/e2e/run_all.sh
308308
309-
- name: Self-host smoke (freshly-built mcpp builds itself again)
309+
- name: "Toolchain: LLVM — build mcpp (self-host)"
310310
run: |
311311
MCPP=$(find target -path "*/bin/mcpp" | head -1)
312312
MCPP=$(cd "$(dirname "$MCPP")" && pwd)/$(basename "$MCPP")
313313
test -x "$MCPP"
314-
export PATH="$(dirname "$MCPP"):$PATH"
314+
"$MCPP" toolchain default llvm@20.1.7
315+
"$MCPP" clean
315316
"$MCPP" build
316317
"$MCPP" --version
317-
echo ":: Self-host smoke PASS"
318-
319-
# Fresh user experience test moved to ci-fresh-install.yml (PR #63)

.github/workflows/ci-windows.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,21 +100,14 @@ jobs:
100100
"$MCPP_SELF" toolchain default llvm@20.1.7 2>/dev/null || true
101101
bash tests/e2e/run_all.sh
102102
103-
- name: Self-host smoke (freshly-built mcpp builds itself again)
104-
shell: bash
105-
run: |
106-
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
107-
"$MCPP_SELF" build
108-
"$MCPP_SELF" --version
109-
echo ":: Self-host smoke PASS"
110-
111-
- name: "Toolchain: LLVM — build mcpp"
103+
- name: "Toolchain: LLVM — build mcpp (self-host)"
112104
shell: bash
113105
run: |
114106
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
115107
"$MCPP_SELF" toolchain default llvm@20.1.7
116108
"$MCPP_SELF" clean
117109
"$MCPP_SELF" build
110+
"$MCPP_SELF" --version
118111
119112
- name: Package Windows release zip
120113
id: package

.github/workflows/ci.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,13 @@ jobs:
128128
"$MCPP" toolchain default gcc@16.1.0
129129
bash tests/e2e/run_all.sh
130130
131-
- name: Self-host smoke (freshly-built mcpp builds itself again)
132-
run: |
133-
MCPP=$(realpath "$(find target -type f -name mcpp -printf '%T@ %p\n' | sort -rn | head -1 | cut -d' ' -f2)")
134-
"$MCPP" build
135-
"$MCPP" test
136-
137-
- name: "Toolchain: GCC — build mcpp"
131+
- name: "Toolchain: GCC — build mcpp + test"
138132
run: |
139133
MCPP=$(realpath "$(find target -type f -name mcpp -printf '%T@ %p\n' | sort -rn | head -1 | cut -d' ' -f2)")
140134
"$MCPP" toolchain default gcc@16.1.0
141135
"$MCPP" clean
142136
"$MCPP" build
137+
"$MCPP" test
143138
144139
- name: "Toolchain: musl-gcc — build mcpp"
145140
run: |

0 commit comments

Comments
 (0)