Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libc++][CI] Updates Clang HEAD version in Docker. #126419

Merged
merged 1 commit into from
Feb 10, 2025

Conversation

mordante
Copy link
Member

@mordante mordante commented Feb 9, 2025

This is a preparation to test Clang 21 in the CI,

Drive-by: Updated some outdated documentation.

This is a preparation to test Clang 21 in the CI,

Drive-by: Updated some outdated documentation.
@mordante mordante requested a review from a team as a code owner February 9, 2025 14:15
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Feb 9, 2025
@llvmbot
Copy link
Member

llvmbot commented Feb 9, 2025

@llvm/pr-subscribers-libcxx

Author: Mark de Wever (mordante)

Changes

This is a preparation to test Clang 21 in the CI,

Drive-by: Updated some outdated documentation.


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

2 Files Affected:

  • (modified) libcxx/utils/ci/Dockerfile (+4-5)
  • (modified) libcxx/utils/ci/docker-compose.yml (+1-1)
diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index d0144908f098bd9..bd41f288686a44a 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -7,18 +7,17 @@
 # ===----------------------------------------------------------------------===##
 #
 # This file defines the buildkite and github actions builder images.
-# You can build both images using:
+# This images are tagged with <tag>. You can build both images using:
 #
-#   docker compose build
+#   TAG=<tag> docker compose build
 #
 # Or you can select a single image to build
 #
-#  docker compose build buildkite-builder
+#  TAG=test docker compose build actions-builder
 #
 # The final images can be found at
 #
-#  ghcr.io/libcxx/buildkite-builder
-#  ghcr.io/libcxx/actions-builder
+#  ghcr.io/libcxx/libcxx-linux-builder
 #  ghcr.io/libcxx/android-buildkite-builder
 #
 # Members of the github.com/libcxx/ organizations can push new images to the CI.
diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml
index 1e5d35a7fecdb55..16db1b0e3acb30c 100644
--- a/libcxx/utils/ci/docker-compose.yml
+++ b/libcxx/utils/ci/docker-compose.yml
@@ -1,6 +1,6 @@
 x-versions: &compiler_versions
   GCC_LATEST_VERSION: 14
-  LLVM_HEAD_VERSION: 20
+  LLVM_HEAD_VERSION: 21
 
 services:
   actions-builder:

@Zingam
Copy link
Contributor

Zingam commented Feb 10, 2025

Should the supported compilers on this page be updated too: https://libcxx.llvm.org/#platform-and-compiler-support

@mordante
Copy link
Member Author

Should the supported compilers on this page be updated too: https://libcxx.llvm.org/#platform-and-compiler-support

I prefer to do that in the patch that enables the testing in the CI.

@mordante mordante merged commit b319dfe into llvm:main Feb 10, 2025
79 checks passed
@mordante mordante deleted the review/updates_docker_clang_revision branch February 10, 2025 17:08
Icohedron pushed a commit to Icohedron/llvm-project that referenced this pull request Feb 11, 2025
This is a preparation to test Clang 21 in the CI,

Drive-by: Updated some outdated documentation.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants