Skip to content

Commit 97791ed

Browse files
committed
fix: actually update ci.yml (previous edit didn't take effect)
1 parent 55812b3 commit 97791ed

1 file changed

Lines changed: 20 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,30 +134,33 @@ jobs:
134134
"$MCPP" build
135135
"$MCPP" test
136136
137-
- name: Toolchain install smoke test (mcpp toolchain install llvm)
137+
- name: "Toolchain: GCC — mcpp new → build → run"
138138
run: |
139-
# Test the core user flow: install a toolchain, create a project,
140-
# build with it. Uses the freshly-built mcpp (not bootstrap).
141139
MCPP=$(realpath "$(find target -type f -name mcpp -printf '%T@ %p\n' | sort -rn | head -1 | cut -d' ' -f2)")
142-
# Install LLVM toolchain into mcpp's sandbox
143-
"$MCPP" toolchain install llvm 20.1.7
144-
# Set as default so the build picks it up
145-
"$MCPP" toolchain default llvm@20.1.7
146-
# Build a hello-world project with the installed toolchain
140+
"$MCPP" toolchain default gcc@16.1.0
147141
TMP=$(mktemp -d)
148142
cd "$TMP"
149-
"$MCPP" new hello
150-
cd hello
151-
"$MCPP" build
143+
"$MCPP" new hello_gcc
144+
cd hello_gcc
152145
"$MCPP" run
153146
154-
- name: Fresh user experience (xlings install mcpp → new → run)
155-
continue-on-error: true
147+
- name: "Toolchain: musl-gcc — mcpp new → build → run"
156148
run: |
157-
# Test real user flow with xlings-distributed mcpp.
158-
# May fail if xlings mcpp version lacks recent fixes.
149+
MCPP=$(realpath "$(find target -type f -name mcpp -printf '%T@ %p\n' | sort -rn | head -1 | cut -d' ' -f2)")
150+
"$MCPP" toolchain default gcc@15.1.0-musl
151+
TMP=$(mktemp -d)
152+
cd "$TMP"
153+
"$MCPP" new hello_musl
154+
cd hello_musl
155+
"$MCPP" run
156+
157+
- name: "Toolchain: LLVM — install + mcpp new → build → run"
158+
run: |
159+
MCPP=$(realpath "$(find target -type f -name mcpp -printf '%T@ %p\n' | sort -rn | head -1 | cut -d' ' -f2)")
160+
"$MCPP" toolchain install llvm 20.1.7
161+
"$MCPP" toolchain default llvm@20.1.7
159162
TMP=$(mktemp -d)
160163
cd "$TMP"
161-
"$MCPP" new hello
162-
cd hello
164+
"$MCPP" new hello_llvm
165+
cd hello_llvm
163166
"$MCPP" run

0 commit comments

Comments
 (0)