[libcxx] Fix container build and bump clang version #153035
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch fixes the libcxx container build. There was a missing env variable that would cause the containers to not be built. Now that clang 22 is out, we also want to bump the LLVM head version to 22.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Aiden Grossman (boomanaiden154) ChangesThis patch fixes the libcxx container build. There was a missing env variable that would cause the containers to not be built. Now that clang 22 is out, we also want to bump the LLVM head version to 22. Full diff: https://github.com/llvm/llvm-project/pull/153035.diff 1 Files Affected:
diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml
index 36b8dd77c47fb..a024b7d36d0b8 100644
--- a/libcxx/utils/ci/docker-compose.yml
+++ b/libcxx/utils/ci/docker-compose.yml
@@ -1,6 +1,10 @@
x-versions: &compiler_versions
GCC_HEAD_VERSION: 16
- LLVM_HEAD_VERSION: 21
+ LLVM_HEAD_VERSION: 22
+
+x-image-versions: &image_versions
+ BASE_IMAGE: ubuntu:jammy
+ ACTIONS_BASE_IMAGE: builder-base
services:
builder-base:
@@ -10,8 +14,7 @@ services:
dockerfile: Dockerfile
target: builder-base
args:
- BASE_IMAGE: ubuntu:jammy
- <<: *compiler_versions
+ <<: [*image_versions, *compiler_versions]
actions-builder:
image: ghcr.io/llvm/libcxx-linux-builder:${TAG}
@@ -20,10 +23,8 @@ services:
dockerfile: Dockerfile
target: actions-builder
args:
- BASE_IMAGE: ubuntu:jammy
- ACTIONS_BASE_IMAGE: builder-base
GITHUB_RUNNER_VERSION: "2.326.0"
- <<: *compiler_versions
+ <<: [*image_versions, *compiler_versions]
android-buildkite-builder:
image: ghcr.io/llvm/libcxx-android-builder:${TAG}
@@ -32,8 +33,7 @@ services:
dockerfile: Dockerfile
target: android-buildkite-builder
args:
- BASE_IMAGE: ubuntu:noble
ANDROID_CLANG_VERSION: r563880
ANDROID_CLANG_PREBUILTS_COMMIT: 6ae4184bb8706f9731569b9a0a82be3fcdcb951c
ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f
- <<: *compiler_versions
+ <<: [*image_versions, *compiler_versions]
|
cmtice
reviewed
Aug 11, 2025
|
LGTM, but I'd like one of the libc++ maintainers to approve this too. |
boomanaiden154
added a commit
to boomanaiden154/llvm-zorg
that referenced
this pull request
Aug 11, 2025
…23fa0be76 After llvm/llvm-project#153035 we have a new runner image that should theoretically work. Set the next runner set to use it so we can start testing.
boomanaiden154
added a commit
to llvm/llvm-zorg
that referenced
this pull request
Aug 11, 2025
After llvm/llvm-project#153035 we have a new runner image that should theoretically work. Set the next runner set to use it so we can start testing.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch fixes the libcxx container build. There was a missing env variable that would cause the containers to not be built. Now that clang 22 is out, we also want to bump the LLVM head version to 22.