[libcxx-commits] [libcxx] [libc++] Upgrade to GCC 14 in the CI (PR #95212)

[Nikolas Klauser via libcxx-commits]

https://github.com/philnik777 created https://github.com/llvm/llvm-project/pull/95212

None

>From c0e4fee51bb3bf41afa476d18d70f0d9004de4cb Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser at berlin.de>
Date: Wed, 12 Jun 2024 11:22:48 +0200
Subject: [PATCH] [libc++] Upgrade to GCC 14 in the CI

---
 libcxx/utils/ci/Dockerfile         | 7 ++-----
 libcxx/utils/ci/docker-compose.yml | 7 +++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 54dd0f1186880..972b9a579dfdd 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -91,10 +91,10 @@ RUN sudo apt-get update \
         make \
         python3 \
         python3-dev \
-        python3-distutils \
+        python3-setuptools \
         python3-psutil \
         software-properties-common \
-        swig4.0 \
+        swig \
         unzip \
         uuid-dev \
         wget \
@@ -289,6 +289,3 @@ FROM builder-base AS actions-builder
 
 WORKDIR /home/runner
 USER runner
-
-
-
diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml
index 63aa43990b293..aff079e98edc0 100644
--- a/libcxx/utils/ci/docker-compose.yml
+++ b/libcxx/utils/ci/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 
 x-versions: &compiler_versions
-  GCC_LATEST_VERSION: 13
+  GCC_LATEST_VERSION: 14
   LLVM_HEAD_VERSION: 19
 
 services:
@@ -12,7 +12,7 @@ services:
       dockerfile: Dockerfile
       target: buildkite-builder
       args:
-        BASE_IMAGE: ubuntu:jammy
+        BASE_IMAGE: ubuntu:noble
         <<: *compiler_versions
   actions-builder:
     image: ghcr.io/libcxx/actions-builder:${TAG:-latest}
@@ -30,9 +30,8 @@ services:
       dockerfile: Dockerfile
       target: android-buildkite-builder
       args:
-        BASE_IMAGE: ubuntu:jammy
+        BASE_IMAGE: ubuntu:noble
         ANDROID_CLANG_VERSION: r498229b
         ANDROID_CLANG_PREBUILTS_COMMIT: 5186d132c99aa75dc25207c392e3ea5b93d0107e
         ANDROID_SYSROOT_BID: 10957860
         <<: *compiler_versions
-