[libcxx-commits] [libcxx] Build actions-builder image with clang binaries pinned to 18.0 (PR #84529)
via libcxx-commits
libcxx-commits at lists.llvm.org
Fri Mar 8 10:12:38 PST 2024
https://github.com/EricWF created https://github.com/llvm/llvm-project/pull/84529
This is a temp workaround to allow the modules tests flake less for the
moment
>From d45532af4a65169859e894cf9f45057e2ebb9290 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric at efcs.ca>
Date: Fri, 8 Mar 2024 13:11:45 -0500
Subject: [PATCH] Build actions-builder image with clang binaries pinned to
18.0
This is a temp workaround to allow the modules tests flake less for the
moment
---
libcxx/utils/ci/Dockerfile | 6 +++++-
libcxx/utils/ci/docker-compose.yml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 225de937cc869a..4651d266ca96f3 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -130,7 +130,11 @@ RUN <<EOF
sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 3)) all # for CI transitions
sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 2)) all # previous release
sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 1)) all # latest release
- sudo /tmp/llvm.sh $LLVM_HEAD_VERSION all # current ToT
+
+
+ # FIXME(EricWF): Remove the ".0" from the version number. We're doing this temporarily to allow clang-tidy to be
+ # built against binary packages, and we need to pin those packages for stability.
+ sudo /tmp/llvm.sh ${LLVM_HEAD_VERSION}.0 all # current ToT
sudo apt-get install -y libomp5-$LLVM_HEAD_VERSION
sudo rm -rf /var/lib/apt/lists/*
EOF
diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml
index 5cefcb28bd860c..1f38d498737481 100644
--- a/libcxx/utils/ci/docker-compose.yml
+++ b/libcxx/utils/ci/docker-compose.yml
@@ -15,7 +15,7 @@ services:
BASE_IMAGE: ubuntu:jammy
<<: *compiler_versions
actions-builder:
- image: ghcr.io/libcxx/actions-builder:${TAG:-latest}
+ image: ghcr.io/libcxx/actions-builder:${TAG:-clang-18.0}
build:
context: .
dockerfile: Dockerfile
More information about the libcxx-commits
mailing list