[llvm] [libc++] Bump libc++ CI to a more recent version of the Docker image (PR #116558)

Louis Dionne via llvm-commits llvm-commits at lists.llvm.org
Sun Nov 17 15:05:16 PST 2024


https://github.com/ldionne updated https://github.com/llvm/llvm-project/pull/116558

>From a8dc5e6dca8f80dd77fe57846d337d4fac1765dd Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Sun, 17 Nov 2024 23:44:37 +0100
Subject: [PATCH 1/2] [libc++] Bump libc++ CI to a more recent version of the
 Docker image

The Docker image was built using the recently introduced Action that
builds and pushes to the LLVM Docker registry.
---
 .github/workflows/libcxx-build-and-test.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 964ab654f3fb98..84f0b7592f4e87 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -44,13 +44,13 @@ env:
   GCC_STABLE_VERSION: "13"
   LLVM_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer-19"
   CLANG_CRASH_DIAGNOSTICS_DIR: "crash_diagnostics"
-
+  LIBCXX_LINUX_IMAGE_TAG: "0fd6f684b9c84c32d6cbfd9742402e788b2879f1"
 
 jobs:
   stage1:
     if: github.repository_owner == 'llvm'
     runs-on: libcxx-self-hosted-linux
-    container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
+    container: ghcr.io/llvm/libcxx-linux-builder:{{LIBCXX_LINUX_IMAGE_TAG}}
     continue-on-error: false
     strategy:
       fail-fast: false
@@ -87,7 +87,7 @@ jobs:
   stage2:
     if: github.repository_owner == 'llvm'
     runs-on: libcxx-self-hosted-linux
-    container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
+    container: ghcr.io/llvm/libcxx-linux-builder:{{LIBCXX_LINUX_IMAGE_TAG}}
     needs: [ stage1 ]
     continue-on-error: false
     strategy:
@@ -175,7 +175,7 @@ jobs:
         - config: 'generic-msan'
           machine: libcxx-self-hosted-linux
     runs-on: ${{ matrix.machine }}
-    container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
+    container: ghcr.io/llvm/libcxx-linux-builder:{{LIBCXX_LINUX_IMAGE_TAG}}
     steps:
       - uses: actions/checkout at v4
       - name: ${{ matrix.config }}

>From a4c19c264dff1f040cf2b5ac2fd18ffa8b5b8a9f Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Mon, 18 Nov 2024 00:05:01 +0100
Subject: [PATCH 2/2] Fix syntax

---
 .github/workflows/libcxx-build-and-test.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 84f0b7592f4e87..64f4d6520f2009 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -50,7 +50,7 @@ jobs:
   stage1:
     if: github.repository_owner == 'llvm'
     runs-on: libcxx-self-hosted-linux
-    container: ghcr.io/llvm/libcxx-linux-builder:{{LIBCXX_LINUX_IMAGE_TAG}}
+    container: ghcr.io/llvm/libcxx-linux-builder:${{ LIBCXX_LINUX_IMAGE_TAG }}
     continue-on-error: false
     strategy:
       fail-fast: false
@@ -87,7 +87,7 @@ jobs:
   stage2:
     if: github.repository_owner == 'llvm'
     runs-on: libcxx-self-hosted-linux
-    container: ghcr.io/llvm/libcxx-linux-builder:{{LIBCXX_LINUX_IMAGE_TAG}}
+    container: ghcr.io/llvm/libcxx-linux-builder:${{ LIBCXX_LINUX_IMAGE_TAG }}
     needs: [ stage1 ]
     continue-on-error: false
     strategy:
@@ -175,7 +175,7 @@ jobs:
         - config: 'generic-msan'
           machine: libcxx-self-hosted-linux
     runs-on: ${{ matrix.machine }}
-    container: ghcr.io/llvm/libcxx-linux-builder:{{LIBCXX_LINUX_IMAGE_TAG}}
+    container: ghcr.io/llvm/libcxx-linux-builder:${{ LIBCXX_LINUX_IMAGE_TAG }}
     steps:
       - uses: actions/checkout at v4
       - name: ${{ matrix.config }}



More information about the llvm-commits mailing list