This patch does some refactoring to enable installing a new GHA runner binary into an existing libcxx image. We achieve this by pushing the base image to the registry and enabling control over the base image used for building the actions image. This will always build and push both images even if an existing image is being used for the actions image, but this should not impact anything as the SHAs are pinned everywhere and space/build time is not a large concern. Reviewers: ldionne, EricWF, #reviewers-libcxx Reviewed By: ldionne Pull Request: https://github.com/llvm/llvm-project/pull/148073
40 lines
1.1 KiB
YAML
40 lines
1.1 KiB
YAML
x-versions: &compiler_versions
|
|
GCC_HEAD_VERSION: 16
|
|
LLVM_HEAD_VERSION: 21
|
|
|
|
services:
|
|
builder-base:
|
|
image: ghcr.io/llvm/libcxx-linux-builder-base:${TAG}
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
target: builder-base
|
|
args:
|
|
BASE_IMAGE: ubuntu:jammy
|
|
<<: *compiler_versions
|
|
|
|
actions-builder:
|
|
image: ghcr.io/llvm/libcxx-linux-builder:${TAG}
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
target: actions-builder
|
|
args:
|
|
BASE_IMAGE: ubuntu:jammy
|
|
ACTIONS_BASE_IMAGE: builder-base
|
|
GITHUB_RUNNER_VERSION: "2.326.0"
|
|
<<: *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
|
|
<<: *compiler_versions
|