6b4506009a
In docker-compose.yml, add *image_versions arguments for the android-buildkite-builder service, so that ACTIONS_BASE_IMAGE is set (to builder-base). This will also set the BASE_IMAGE, which we don't really want, because this service uses ubuntu:noble instead of the ubuntu:jammy default, but that's OK because the setting is successfully overridden. In vendor/android/run-buildbot-container, use the correct ghcr.io Docker path (ghcr.io/llvm/libcxx-android-builder). Reenable the build-and-push of ghcr.io/llvm/libcxx-android-builder in the libcxx-build-containers.yml workflow.
41 lines
1.2 KiB
YAML
41 lines
1.2 KiB
YAML
x-versions: &compiler_versions
|
|
GCC_HEAD_VERSION: 16
|
|
LLVM_HEAD_VERSION: 22
|
|
|
|
x-image-versions: &image_versions
|
|
BASE_IMAGE: ubuntu:jammy
|
|
ACTIONS_BASE_IMAGE: ghcr.io/llvm/libcxx-linux-builder-base:77cb0980bcc2675b27d08141526939423fa0be76
|
|
|
|
services:
|
|
builder-base:
|
|
image: ghcr.io/llvm/libcxx-linux-builder-base:${TAG}
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
target: builder-base
|
|
args:
|
|
<<: [*image_versions, *compiler_versions]
|
|
|
|
actions-builder:
|
|
image: ghcr.io/llvm/libcxx-linux-builder:${TAG}
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
target: actions-builder
|
|
args:
|
|
GITHUB_RUNNER_VERSION: "2.328.0"
|
|
<<: [*image_versions, *compiler_versions]
|
|
|
|
android-buildkite-builder:
|
|
image: ghcr.io/llvm/libcxx-android-builder:${TAG}
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
target: android-buildkite-builder
|
|
args:
|
|
BASE_IMAGE: ubuntu:noble
|
|
ANDROID_CLANG_VERSION: r563880
|
|
ANDROID_CLANG_PREBUILTS_COMMIT: 6ae4184bb8706f9731569b9a0a82be3fcdcb951c
|
|
ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f
|
|
<<: [*image_versions, *compiler_versions]
|