Skip to content

Commit 63999ff

Browse files
committed
Build using available clang-21 and gcc-15 in CI
Replace the action that installs a requested compiler with a basic script, the action fails to download recent compilers. Signed-off-by: Björn Svensson <bjorn.a.svensson@est.tech>
1 parent ebc4aea commit 63999ff

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
matrix:
3232
include:
3333
# New compilers
34-
- compiler: 'clang-20'
35-
cmake-version: '4.0'
34+
- compiler: 'clang-21'
35+
cmake-version: '4.2'
3636
cmake-build-type: Release
37-
- compiler: 'gcc-14'
38-
cmake-version: '4.0'
37+
- compiler: 'gcc-15'
38+
cmake-version: '4.2'
3939
cmake-build-type: Release
4040
# Old compilers
4141
- compiler: 'clang-14'
@@ -45,10 +45,12 @@ jobs:
4545
cmake-version: '3.13'
4646
cmake-build-type: Release
4747
# Sanitizers enabled
48-
compiler: ['gcc-14', 'clang-20']
49-
cmake-version: ['4.0']
48+
compiler: ['clang-21', 'gcc-15']
49+
cmake-version: ['4.2']
5050
cmake-build-type: [RelWithDebInfo]
5151
sanitizer: [thread, undefined, leak, address]
52+
env:
53+
CC: ${{ matrix.compiler }}
5254
steps:
5355
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5456
- name: Prepare
@@ -57,9 +59,21 @@ jobs:
5759
packages: libevent-dev libuv1-dev libev-dev libglib2.0-dev valkey-server
5860
version: 1.0
5961
- name: Setup compiler
60-
uses: aminya/setup-cpp@1f17f92d6a52bfcb1a25348e2c526c2e5cbb1134 # v1.8.0
61-
with:
62-
compiler: ${{ matrix.compiler }}
62+
run: |
63+
COMP="${{ matrix.compiler }}"
64+
TYPE="${COMP%%-*}"
65+
VERSION="${COMP##*-}"
66+
echo "Installing $TYPE version $VERSION"
67+
68+
if [ "$TYPE" = "clang" ]; then
69+
wget https://apt.llvm.org/llvm.sh
70+
chmod +x llvm.sh
71+
sudo apt-get install -y "${{ matrix.compiler }}" || sudo ./llvm.sh "$VERSION"
72+
else
73+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
74+
sudo apt-get update
75+
sudo apt-get install -y "${{ matrix.compiler }}"
76+
fi
6377
- name: Setup CMake
6478
uses: jwlawson/actions-setup-cmake@3a6cbe35ba64df7ca70c51365c4aff65db9a9037 # v2.1.1
6579
with:

0 commit comments

Comments
 (0)