Skip to content

Commit 950de23

Browse files
committed
Merge 'Update compilers in GH actions scripts' from Pavel Emelyanov
Actions run in native gihub ubuntu-24.04 containers, which is the newest available one. Default compliers versions in it are pretty old, but fortunately newer versions are also available from built-in repositories. Closes #3114 * github.com:scylladb/seastar: github: Use gcc-14 github: Use clang-20
2 parents 65cbae6 + 3c5e265 commit 950de23

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

.github/workflows/test.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,17 @@ jobs:
5353
- name: Install clang++
5454
if: ${{ inputs.compiler == 'clang++' }}
5555
run: |
56-
sudo apt-get -y install clang
56+
sudo apt-get -y install clang-20
5757
5858
- name: Install clang-scan-deps
5959
if: ${{ contains(inputs.enables, 'cxx-modules') }}
6060
run: |
61-
sudo apt-get -y install clang-tools
61+
sudo apt-get -y install clang-tools-20
62+
63+
- name: Install g++
64+
if: ${{ inputs.compiler == 'g++' }}
65+
run: |
66+
sudo apt-get -y install gcc-14 g++-14
6267
6368
- name: Install ccache
6469
if: ${{ inputs.enable-ccache }}
@@ -74,16 +79,18 @@ jobs:
7479
- name: Configure
7580
run: |
7681
if [ ${{ inputs.compiler }} = "clang++" ]; then
77-
CC=clang
82+
CC=clang-20
83+
CPP=clang++-20
7884
else
79-
CC=gcc
85+
CC=gcc-14
86+
CPP=g++-14
8087
fi
8188
if ${{ inputs.enable-ccache }}; then
8289
MAYBE_CCACHE_OPT="--ccache"
8390
fi
8491
./configure.py \
8592
--c++-standard ${{ inputs.standard }} \
86-
--compiler ${{ inputs.compiler }} \
93+
--compiler $CPP \
8794
--c-compiler $CC \
8895
--mode ${{ inputs.mode }} \
8996
$MAYBE_CCACHE_OPT \

0 commit comments

Comments
 (0)