Skip to content

Commit 5d77458

Browse files
committed
ci: revert to musl-gcc, skip mo_yanxi-react_flow on Linux (GCC TU-local)
1 parent c6acdf6 commit 5d77458

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@ jobs:
8282
if: runner.os == 'Linux'
8383
working-directory: tests
8484
run: |
85-
GCC_VER=$(python3 -c "import json; print(json.load(open('../.xlings.json'))['workspace']['gcc']['linux'])")
86-
GCC_SDK="$HOME/.xlings/data/xpkgs/xim-x-gcc/${GCC_VER}"
85+
MUSL_VER=$(python3 -c "import json; print(json.load(open('../.xlings.json'))['workspace']['musl-gcc']['linux'])")
86+
MUSL_SDK="$HOME/.xlings/data/xpkgs/xim-x-musl-gcc/${MUSL_VER}"
8787
xmake f -P . -y -vv \
88-
--cc="${GCC_SDK}/bin/gcc" \
89-
--cxx="${GCC_SDK}/bin/g++"
88+
--sdk="${MUSL_SDK}" \
89+
--cross=x86_64-linux-musl- \
90+
--cc="${MUSL_SDK}/bin/x86_64-linux-musl-gcc" \
91+
--cxx="${MUSL_SDK}/bin/x86_64-linux-musl-g++"
9092
9193
- name: Configure (macos)
9294
if: runner.os == 'macOS'
@@ -124,10 +126,11 @@ jobs:
124126
echo "Building changed targets: $TARGETS"
125127
fi
126128
127-
# llmapi_test: skip entirely — requires API key to run, and xmake's
128-
# C++23 module system can't resolve transitive module deps from
129-
# installed packages. Tested in llmapi's own repo CI instead.
130-
TARGETS=$(echo "$TARGETS" | tr ' ' '\n' | grep -v llmapi_test | tr '\n' ' ')
129+
# Skip known-incompatible targets:
130+
# - llmapi_test: requires API key, xmake module transitive dep issue
131+
# - mo_yanxi-react_flow_test: uses TU-local lambdas in type aliases,
132+
# GCC rejects per C++23 [basic.link]/15 (Clang-only for now)
133+
TARGETS=$(echo "$TARGETS" | tr ' ' '\n' | grep -v -E 'llmapi_test|mo_yanxi-react_flow_test' | tr '\n' ' ')
131134
132135
FAILED=""
133136
for target in $TARGETS; do

.xlings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"workspace": {
33
"xmake": "3.0.7",
4-
"gcc": { "linux": "16.1.0" },
4+
"musl-gcc": { "linux": "15.1.0" },
55
"llvm": { "macosx": "20.1.7" }
66
}
77
}

0 commit comments

Comments
 (0)