Skip to content

Commit c0e4fee

Browse files
committed
[libc++] Upgrade to GCC 14 in the CI
1 parent 7ef83f5 commit c0e4fee

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

libcxx/utils/ci/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ RUN sudo apt-get update \
9191
make \
9292
python3 \
9393
python3-dev \
94-
python3-distutils \
94+
python3-setuptools \
9595
python3-psutil \
9696
software-properties-common \
97-
swig4.0 \
97+
swig \
9898
unzip \
9999
uuid-dev \
100100
wget \
@@ -289,6 +289,3 @@ FROM builder-base AS actions-builder
289289

290290
WORKDIR /home/runner
291291
USER runner
292-
293-
294-

libcxx/utils/ci/docker-compose.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.7'
22

33
x-versions: &compiler_versions
4-
GCC_LATEST_VERSION: 13
4+
GCC_LATEST_VERSION: 14
55
LLVM_HEAD_VERSION: 19
66

77
services:
@@ -12,7 +12,7 @@ services:
1212
dockerfile: Dockerfile
1313
target: buildkite-builder
1414
args:
15-
BASE_IMAGE: ubuntu:jammy
15+
BASE_IMAGE: ubuntu:noble
1616
<<: *compiler_versions
1717
actions-builder:
1818
image: ghcr.io/libcxx/actions-builder:${TAG:-latest}
@@ -30,9 +30,8 @@ services:
3030
dockerfile: Dockerfile
3131
target: android-buildkite-builder
3232
args:
33-
BASE_IMAGE: ubuntu:jammy
33+
BASE_IMAGE: ubuntu:noble
3434
ANDROID_CLANG_VERSION: r498229b
3535
ANDROID_CLANG_PREBUILTS_COMMIT: 5186d132c99aa75dc25207c392e3ea5b93d0107e
3636
ANDROID_SYSROOT_BID: 10957860
3737
<<: *compiler_versions
38-

0 commit comments

Comments
 (0)