Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 2 additions & 5 deletions libcxx/utils/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ RUN sudo apt-get update \
make \
python3 \
python3-dev \
python3-distutils \
python3-packaging \
python3-setuptools \
python3-psutil \
software-properties-common \
swig4.0 \
swig \
unzip \
uuid-dev \
wget \
Expand Down Expand Up @@ -290,6 +290,3 @@ FROM builder-base AS actions-builder

WORKDIR /home/runner
USER runner



7 changes: 3 additions & 4 deletions libcxx/utils/ci/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.7'

x-versions: &compiler_versions
GCC_LATEST_VERSION: 13
GCC_LATEST_VERSION: 14
LLVM_HEAD_VERSION: 19

services:
Expand All @@ -12,7 +12,7 @@ services:
dockerfile: Dockerfile
target: buildkite-builder
args:
BASE_IMAGE: ubuntu:jammy
BASE_IMAGE: ubuntu:noble
<<: *compiler_versions
actions-builder:
image: ghcr.io/libcxx/actions-builder:${TAG:-latest}
Expand All @@ -30,9 +30,8 @@ services:
dockerfile: Dockerfile
target: android-buildkite-builder
args:
BASE_IMAGE: ubuntu:jammy
BASE_IMAGE: ubuntu:noble
ANDROID_CLANG_VERSION: r498229b
ANDROID_CLANG_PREBUILTS_COMMIT: 5186d132c99aa75dc25207c392e3ea5b93d0107e
ANDROID_SYSROOT_BID: 10957860
<<: *compiler_versions