Skip to content

[libcxx] Fix container build and bump clang version #153035

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

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions libcxx/utils/ci/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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}
Expand All @@ -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}
Expand Down
Loading