Skip to content

Commit c6acdf6

Browse files
committed
ci: switch Linux from musl-gcc to gcc 16.1.0 (broader C++23 compat)
1 parent 1464915 commit c6acdf6

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,11 @@ jobs:
8282
if: runner.os == 'Linux'
8383
working-directory: tests
8484
run: |
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}"
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}"
8787
xmake f -P . -y -vv \
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++"
88+
--cc="${GCC_SDK}/bin/gcc" \
89+
--cxx="${GCC_SDK}/bin/g++"
9290
9391
- name: Configure (macos)
9492
if: runner.os == 'macOS'

.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-
"musl-gcc": { "linux": "15.1.0" },
4+
"gcc": { "linux": "16.1.0" },
55
"llvm": { "macosx": "20.1.7" }
66
}
77
}

0 commit comments

Comments
 (0)