File tree Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -91,11 +91,11 @@ RUN sudo apt-get update \
9191 make \
9292 python3 \
9393 python3-dev \
94- python3-distutils \
9594 python3-packaging \
95+ python3-setuptools \
9696 python3-psutil \
9797 software-properties-common \
98- swig4.0 \
98+ swig \
9999 unzip \
100100 uuid-dev \
101101 wget \
@@ -290,6 +290,3 @@ FROM builder-base AS actions-builder
290290
291291WORKDIR /home/runner
292292USER runner
293-
294-
295-
Original file line number Diff line number Diff line change 11version : ' 3.7'
22
33x-versions : &compiler_versions
4- GCC_LATEST_VERSION : 13
4+ GCC_LATEST_VERSION : 14
55 LLVM_HEAD_VERSION : 19
66
77services :
@@ -12,7 +12,7 @@ services:
1212 dockerfile : Dockerfile
1313 target : buildkite-builder
1414 args :
15- BASE_IMAGE : ubuntu:jammy
15+ BASE_IMAGE : ubuntu:noble
1616 << : *compiler_versions
1717 actions-builder :
1818 image : ghcr.io/libcxx/actions-builder:${TAG:-latest}
@@ -30,9 +30,8 @@ services:
3030 dockerfile : Dockerfile
3131 target : android-buildkite-builder
3232 args :
33- BASE_IMAGE : ubuntu:jammy
33+ BASE_IMAGE : ubuntu:noble
3434 ANDROID_CLANG_VERSION : r498229b
3535 ANDROID_CLANG_PREBUILTS_COMMIT : 5186d132c99aa75dc25207c392e3ea5b93d0107e
3636 ANDROID_SYSROOT_BID : 10957860
3737 << : *compiler_versions
38-
You can’t perform that action at this time.
0 commit comments