Skip to content

Commit 3ec0713

Browse files
committed
fix: CI — tee to file instead of /dev/stderr (Windows compat), precise grep
- Replace `tee /dev/stderr` with `tee build.log` (Git Bash on Windows doesn't have /dev/stderr) - All grep assertions read from build.log file - musl grep: "musl" → "Resolved gcc@15.1.0-musl" (more precise)
1 parent 6d36a81 commit 3ec0713

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
MCPP=/tmp/mcpp-fresh.exe
119119
"$MCPP" toolchain default llvm@20.1.7
120120
"$MCPP" clean --bmi-cache
121-
"$MCPP" build 2>&1 | tee /dev/stderr | grep -q "Resolved llvm@20.1.7"
121+
"$MCPP" build 2>&1 | tee build.log; grep -q "Resolved llvm@20.1.7" build.log
122122
123123
- name: Package Windows release zip
124124
id: package

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,20 @@ jobs:
137137
- name: "Toolchain: GCC — build mcpp + test"
138138
run: |
139139
"$MCPP" clean
140-
"$MCPP" build 2>&1 | tee /dev/stderr | grep -q "Resolved gcc@16.1.0"
140+
"$MCPP" build 2>&1 | tee build.log; grep -q "Resolved gcc@16.1.0" build.log
141141
"$MCPP" test
142142
143143
- name: "Toolchain: musl-gcc — build mcpp (--target)"
144144
run: |
145145
"$MCPP" clean
146-
"$MCPP" build --target x86_64-linux-musl 2>&1 | tee /dev/stderr | grep -q "musl"
146+
"$MCPP" build --target x86_64-linux-musl 2>&1 | tee build.log; grep -q "Resolved gcc@15.1.0-musl" build.log
147147
148148
- name: "Toolchain: LLVM — build mcpp"
149149
run: |
150150
"$MCPP" toolchain install llvm 20.1.7
151151
# Override project toolchain to use LLVM for this build
152152
sed -i 's/^default = "gcc@16.1.0"/default = "llvm@20.1.7"/' mcpp.toml
153153
"$MCPP" clean
154-
"$MCPP" build 2>&1 | tee /dev/stderr | grep -q "Resolved llvm@20.1.7"
154+
"$MCPP" build 2>&1 | tee build.log; grep -q "Resolved llvm@20.1.7" build.log
155155
# Restore
156156
sed -i 's/^default = "llvm@20.1.7"/default = "gcc@16.1.0"/' mcpp.toml

0 commit comments

Comments
 (0)