[libcxx-commits] [libcxx] 599fc2c - [Github] Bump libcxx image to ubuntu 26.04 (#225550)

[via libcxx-commits]

Author: Aiden Grossman
Date: 2026-09-24T09:50:34-07:00
New Revision: 599fc2cfc60421ea402dd0ec57f5106bf452962c

URL: https://github.com/llvm/llvm-project/commit/599fc2cfc60421ea402dd0ec57f5106bf452962c
DIFF: https://github.com/llvm/llvm-project/commit/599fc2cfc60421ea402dd0ec57f5106bf452962c.diff

LOG: [Github] Bump libcxx image to ubuntu 26.04 (#225550)

To match the rest of the premerge CI images.

Added: 
    

Modified: 
    libcxx/utils/ci/docker/linux-builder.dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/docker/linux-builder.dockerfile b/libcxx/utils/ci/docker/linux-builder.dockerfile
index 18ed3908fa8be..5035899cfda3c 100644
--- a/libcxx/utils/ci/docker/linux-builder.dockerfile
+++ b/libcxx/utils/ci/docker/linux-builder.dockerfile
@@ -16,7 +16,7 @@
 # This image also gets built on every push to `main` that modifies these Docker
 # files, and can be found at ghcr.io/libcxx/libcxx-linux-builder-base .
 
-FROM docker.io/library/ubuntu:noble
+FROM docker.io/library/ubuntu:26.04
 
 # Changing this file causes a rebuild of the image in a GitHub action. However, it does not cause
 # the CI runners to switch to that image automatically, that must be done by updating the image used
@@ -99,8 +99,8 @@ RUN <<EOF
   # Install the most recent GCC as well as the previous version to ease transitions.
   install_gcc() {
     sudo /tmp/ce-infra/bin/ce_install install compilers/c++/x86/gcc $1.1.0
-    sudo ln -s /opt/compiler-explorer/gcc-$1.1.0/bin/gcc /usr/bin/gcc-$1
-    sudo ln -s /opt/compiler-explorer/gcc-$1.1.0/bin/g++ /usr/bin/g++-$1
+    sudo ln -sf /opt/compiler-explorer/gcc-$1.1.0/bin/gcc /usr/bin/gcc-$1
+    sudo ln -sf /opt/compiler-explorer/gcc-$1.1.0/bin/g++ /usr/bin/g++-$1
   }
 
   set -e
@@ -134,10 +134,3 @@ RUN <<EOF
   sudo rm -rf /tmp/ce-infra
 EOF
 
-RUN <<EOF
-    # Install a recent CMake
-    set -e
-    wget https://github.com/Kitware/CMake/releases/download/v3.31.0/cmake-3.31.0-linux-x86_64.sh -O /tmp/install-cmake.sh
-    sudo bash /tmp/install-cmake.sh --prefix=/usr --exclude-subdir --skip-license
-    rm /tmp/install-cmake.sh
-EOF