diff options
Diffstat (limited to 'libcxx/utils/ci')
| -rw-r--r-- | libcxx/utils/ci/BOT_OWNERS.txt | 4 | ||||
| -rw-r--r-- | libcxx/utils/ci/docker-compose.yml | 2 | ||||
| -rwxr-xr-x | libcxx/utils/ci/vendor/android/run-buildbot-container | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/utils/ci/BOT_OWNERS.txt b/libcxx/utils/ci/BOT_OWNERS.txt index 2d01b96d72a6..90f827251087 100644 --- a/libcxx/utils/ci/BOT_OWNERS.txt +++ b/libcxx/utils/ci/BOT_OWNERS.txt @@ -18,6 +18,6 @@ E: powerllvm@ca.ibm.com D: AIX, ppc64le N: Android libc++ -E: rprichard@google.com -H: rprichard +E: pirama@google.com, sharjeelkhan@google.com +G: pirama-arumuga-nainar, Sharjeel-Khan D: Emulator-based x86[-64] libc++ CI testing diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml index d8ba8e5fba2b..e89623d2a847 100644 --- a/libcxx/utils/ci/docker-compose.yml +++ b/libcxx/utils/ci/docker-compose.yml @@ -37,4 +37,4 @@ services: ANDROID_CLANG_VERSION: r563880 ANDROID_CLANG_PREBUILTS_COMMIT: 6ae4184bb8706f9731569b9a0a82be3fcdcb951c ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f - <<: *compiler_versions + <<: [*image_versions, *compiler_versions] diff --git a/libcxx/utils/ci/vendor/android/run-buildbot-container b/libcxx/utils/ci/vendor/android/run-buildbot-container index 7b5d9a4cc3fe..81c719b1f8b9 100755 --- a/libcxx/utils/ci/vendor/android/run-buildbot-container +++ b/libcxx/utils/ci/vendor/android/run-buildbot-container @@ -27,5 +27,5 @@ if [ -S /var/run/docker.sock ]; then DOCKER_OPTIONS+=(--volume /var/run/docker.sock:/var/run/docker.sock) fi -docker run "${DOCKER_OPTIONS[@]}" ghcr.io/libcxx/android-buildkite-builder \ +docker run "${DOCKER_OPTIONS[@]}" ghcr.io/llvm/libcxx-android-builder \ bash -c 'git config --global --add safe.directory /llvm; (/opt/android/container-setup.sh && exec bash)' |