diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml index bb7243a19cf70..9d54f8d4e3328 100644 --- a/.github/workflows/libcxx-build-and-test.yaml +++ b/.github/workflows/libcxx-build-and-test.yaml @@ -37,7 +37,7 @@ jobs: stage1: if: github.repository_owner == 'llvm' runs-on: libcxx-self-hosted-linux - container: ghcr.io/llvm/libcxx-linux-builder:b6bb9dc5abd7c6452c13a53fa8949cb259db459b + container: ghcr.io/llvm/libcxx-linux-builder:dd97324f119af515944b7ec79fe627cfa70d4a2a continue-on-error: false strategy: fail-fast: false @@ -75,7 +75,7 @@ jobs: stage2: if: github.repository_owner == 'llvm' runs-on: libcxx-self-hosted-linux - container: ghcr.io/llvm/libcxx-linux-builder:b6bb9dc5abd7c6452c13a53fa8949cb259db459b + container: ghcr.io/llvm/libcxx-linux-builder:dd97324f119af515944b7ec79fe627cfa70d4a2a needs: [ stage1 ] continue-on-error: false strategy: @@ -167,7 +167,7 @@ jobs: - config: 'generic-msan' machine: libcxx-self-hosted-linux runs-on: ${{ matrix.machine }} - container: ghcr.io/llvm/libcxx-linux-builder:b6bb9dc5abd7c6452c13a53fa8949cb259db459b + container: ghcr.io/llvm/libcxx-linux-builder:dd97324f119af515944b7ec79fe627cfa70d4a2a steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: ${{ matrix.config }} diff --git a/libcxx/utils/ci/run-buildbot-container b/libcxx/utils/ci/run-buildbot-container index 1be376b71261a..a7551e736653e 100755 --- a/libcxx/utils/ci/run-buildbot-container +++ b/libcxx/utils/ci/run-buildbot-container @@ -26,6 +26,6 @@ if [[ ! -d "${MONOREPO_ROOT}/libcxx/utils/ci" ]]; then echo "Was unable to find the root of the LLVM monorepo; are you running from within the monorepo?" exit 1 fi -docker pull ghcr.io/llvm/libcxx-linux-builder:b6bb9dc5abd7c6452c13a53fa8949cb259db459b -docker run -it --volume "${MONOREPO_ROOT}:/llvm" --workdir "/llvm" --cap-add=SYS_PTRACE ghcr.io/llvm/libcxx-linux-builder:b6bb9dc5abd7c6452c13a53fa8949cb259db459b \ +docker pull ghcr.io/llvm/libcxx-linux-builder:dd97324f119af515944b7ec79fe627cfa70d4a2a +docker run -it --volume "${MONOREPO_ROOT}:/llvm" --workdir "/llvm" --cap-add=SYS_PTRACE ghcr.io/llvm/libcxx-linux-builder:dd97324f119af515944b7ec79fe627cfa70d4a2a \ bash -c 'git config --global --add safe.directory /llvm ; exec bash'