Skip to content

[libc++][Android] Fix Dockerfile #154856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 28, 2025
Merged

[libc++][Android] Fix Dockerfile #154856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c4097a
[libc++][Android] Fix Dockerfile
rprichard Aug 21, 2025
512c6a2
Reenable Android Docker image build.
rprichard Aug 21, 2025
18a51af
Reenable Android image push
rprichard Aug 25, 2025
713ea46
Try to change the default Docker location
rprichard Aug 25, 2025
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
32 changes: 20 additions & 12 deletions .github/workflows/libcxx-build-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# The default Docker storage location for GitHub Actions doesn't have
# enough disk space, so change it to /mnt, which has more disk space.
- name: Change Docker storage location
run: |
sudo mkdir /mnt/docker
echo '{ "data-root": "/mnt/docker" }' | sudo tee /etc/docker/daemon.json
sudo systemctl restart docker

- name: Build the Linux builder image
working-directory: libcxx/utils/ci
run: |
Expand All @@ -40,11 +48,11 @@ jobs:
env:
TAG: ${{ github.sha }}

# - name: Build the Android builder image
# working-directory: libcxx/utils/ci
# run: docker compose build android-buildkite-builder
# env:
# TAG: ${{ github.sha }}
- name: Build the Android builder image
working-directory: libcxx/utils/ci
run: docker compose build android-buildkite-builder
env:
TAG: ${{ github.sha }}

- name: Log in to GitHub Container Registry
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
Expand All @@ -62,10 +70,10 @@ jobs:
env:
TAG: ${{ github.sha }}

# - name: Push the Android builder image
# if: github.event_name == 'push'
# working-directory: libcxx/utils/ci
# run: |
# docker compose push android-buildkite-builder
# env:
# TAG: ${{ github.sha }}
- name: Push the Android builder image
if: github.event_name == 'push'
working-directory: libcxx/utils/ci
run: |
docker compose push android-buildkite-builder
env:
TAG: ${{ github.sha }}
2 changes: 1 addition & 1 deletion libcxx/utils/ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ services:
ANDROID_CLANG_VERSION: r563880
ANDROID_CLANG_PREBUILTS_COMMIT: 6ae4184bb8706f9731569b9a0a82be3fcdcb951c
ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f
<<: *compiler_versions
<<: [*image_versions, *compiler_versions]
2 changes: 1 addition & 1 deletion libcxx/utils/ci/vendor/android/run-buildbot-container
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Loading