From b9297dcdfc35549b22c3a0e38cfe522bd19d5cf7 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Sat, 30 Aug 2025 12:03:37 -0400 Subject: [PATCH] Migrate Linux CI to GCC 12 --- Dockerfile | 1 + Library/Homebrew/os.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b73eb6eae6..c096a0edde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,7 @@ RUN apt-get update \ tzdata \ jq \ && if [ "$(. /etc/lsb-release; echo "${DISTRIB_RELEASE}" | cut -d. -f1)" -ge 22 ]; then apt-get install -y --no-install-recommends skopeo; fi \ + && if [ "$(. /etc/lsb-release; echo "${DISTRIB_RELEASE}" | cut -d. -f1)" -eq 22 ]; then apt-get install -y --no-install-recommends g++-12; fi \ && mkdir -p /etc/apt/keyrings \ && chmod 0755 /etc /etc/apt /etc/apt/keyrings \ && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg >/dev/null \ diff --git a/Library/Homebrew/os.rb b/Library/Homebrew/os.rb index ffa463e864..2e0144673e 100644 --- a/Library/Homebrew/os.rb +++ b/Library/Homebrew/os.rb @@ -49,9 +49,9 @@ module OS LINUX_CI_OS_VERSION = "Ubuntu 22.04" LINUX_GLIBC_CI_VERSION = "2.35" LINUX_GLIBC_NEXT_CI_VERSION = "2.39" - LINUX_GCC_CI_VERSION = "11.0" + LINUX_GCC_CI_VERSION = "12" # https://packages.ubuntu.com/jammy/gcc-12 LINUX_LIBSTDCXX_CI_VERSION = "6.0.30" # https://packages.ubuntu.com/jammy/libstdc++6 - LINUX_PREFERRED_GCC_COMPILER_FORMULA = "gcc@11" # https://packages.ubuntu.com/jammy/gcc + LINUX_PREFERRED_GCC_COMPILER_FORMULA = T.let("gcc@#{LINUX_GCC_CI_VERSION}".freeze, String) LINUX_PREFERRED_GCC_RUNTIME_FORMULA = "gcc" if OS.mac?