Skip to content

Conversation

@ldionne
Copy link
Member

@ldionne ldionne commented Nov 17, 2024

The Docker image was built using the recently introduced Action that builds and pushes to the LLVM Docker registry.

The Docker image was built using the recently introduced Action that
builds and pushes to the LLVM Docker registry.
@llvmbot llvmbot added libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. github:workflow labels Nov 17, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 17, 2024

@llvm/pr-subscribers-libcxx

Author: Louis Dionne (ldionne)

Changes

The Docker image was built using the recently introduced Action that builds and pushes to the LLVM Docker registry.


Full diff: https://github.com/llvm/llvm-project/pull/116558.diff

1 Files Affected:

  • (modified) .github/workflows/libcxx-build-and-test.yaml (+4-4)
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@v4
       - name: ${{ matrix.config }}

@llvmbot
Copy link
Member

llvmbot commented Nov 17, 2024

@llvm/pr-subscribers-github-workflow

Author: Louis Dionne (ldionne)

Changes

The Docker image was built using the recently introduced Action that builds and pushes to the LLVM Docker registry.


Full diff: https://github.com/llvm/llvm-project/pull/116558.diff

1 Files Affected:

  • (modified) .github/workflows/libcxx-build-and-test.yaml (+4-4)
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@v4
       - name: ${{ matrix.config }}

@ldionne ldionne merged commit c2a3ed2 into llvm:main Nov 18, 2024
58 of 60 checks passed
@ldionne ldionne deleted the review/update-docker-image-based-on-llvm-registry branch November 18, 2024 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

github:workflow libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants