Skip to content

Commit 1caf547

Browse files
thesamesamdkm
authored andcommitted
CI: upgrade GCC baseline from 4.8 -> 5.4 (5.5)
GCC's baseline was changed from C++11 -> C++14 and GCC 4.8 -> GCC 5.4 in r15-4719-ga9ec1bc06bd3cc, so adjust the baseline CI job accordingly. One quirk here is that the Ubuntu image we're using in CI has 5.5.0 rather than 5.4.0. But I think we can eat that difference. ChangeLog: * .github/workflows/ccpp.yml: Use GCC 5.5 instead of GCC 4.8.
1 parent 4d0c0b3 commit 1caf547

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/ccpp.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ jobs:
266266
exit 0; \
267267
fi
268268
269-
build-and-check-gcc-48:
269+
build-and-check-gcc-5:
270270

271271
runs-on: ubuntu-22.04
272272
container: ubuntu:18.04
@@ -291,10 +291,10 @@ jobs:
291291
libmpfr-dev \
292292
libmpc-dev \
293293
build-essential \
294-
gcc-4.8 \
295-
g++-4.8 \
296-
gcc-4.8-multilib \
297-
g++-4.8-multilib \
294+
gcc-5 \
295+
g++-5 \
296+
gcc-5-multilib \
297+
g++-5-multilib \
298298
dejagnu;
299299
# install Rust directly using rustup
300300
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0;
@@ -307,8 +307,8 @@ jobs:
307307
mkdir -p gccrs-build;
308308
cd gccrs-build;
309309
../configure \
310-
CC='gcc-4.8' \
311-
CXX='g++-4.8' \
310+
CC='gcc-5' \
311+
CXX='g++-5' \
312312
--enable-languages=rust \
313313
--disable-bootstrap \
314314
--enable-multilib
@@ -328,7 +328,7 @@ jobs:
328328
- name: Archive check-rust results
329329
uses: actions/upload-artifact@v3
330330
with:
331-
name: check-rust-logs-4.8
331+
name: check-rust-logs-5
332332
path: |
333333
gccrs-build/gcc/testsuite/rust/
334334

0 commit comments

Comments
 (0)