fix(ci): restore 3-ABI release build now that LXC has 106 GB disk
The runner LXC was bumped from ~56 GB to 106 GB, giving ~70 GB of free
space — well above the ~40 GB a full 3-ABI release build needs. Revert
the disk-budget workarounds added in ab35fcf:
- Remove "Free disk space" step (no longer needed)
- Restore x86_64 target (arm64-v8a + armeabi-v7a + x86_64)
- Remove ABIS override so build script uses its full default set
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -25,18 +25,6 @@ jobs:
|
|||||||
id: meta
|
id: meta
|
||||||
run: echo "tag=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
|
run: echo "tag=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
# ── Free disk space ────────────────────────────────────────────────
|
|
||||||
# A 2-ABI release build (arm64 + armv7) generates ~15 GB of target/
|
|
||||||
# output. Remove pre-installed runner tooling that is never used
|
|
||||||
# during an Android build to reclaim ~10 GB before we start.
|
|
||||||
- name: Free disk space
|
|
||||||
run: |
|
|
||||||
sudo rm -rf /usr/local/lib/android # runner pre-installed SDK
|
|
||||||
sudo rm -rf /usr/share/dotnet
|
|
||||||
sudo rm -rf /opt/ghc
|
|
||||||
sudo rm -rf /usr/local/share/boost
|
|
||||||
df -h /
|
|
||||||
|
|
||||||
# ── System dependencies ────────────────────────────────────────────
|
# ── System dependencies ────────────────────────────────────────────
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -79,7 +67,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
rustup target add \
|
rustup target add \
|
||||||
aarch64-linux-android \
|
aarch64-linux-android \
|
||||||
armv7-linux-androideabi
|
armv7-linux-androideabi \
|
||||||
|
x86_64-linux-android
|
||||||
|
|
||||||
# ── Cargo caches ───────────────────────────────────────────────────
|
# ── Cargo caches ───────────────────────────────────────────────────
|
||||||
- name: Cache Cargo registry
|
- name: Cache Cargo registry
|
||||||
@@ -121,10 +110,6 @@ jobs:
|
|||||||
BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOLS_VERSION }}
|
BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOLS_VERSION }}
|
||||||
PLATFORM: ${{ env.PLATFORM }}
|
PLATFORM: ${{ env.PLATFORM }}
|
||||||
PROFILE: release
|
PROFILE: release
|
||||||
# arm64-v8a covers all modern Android phones; armeabi-v7a covers
|
|
||||||
# legacy ARM devices. x86_64 is emulator-only and dropped to
|
|
||||||
# stay within the runner's ~25 GB disk budget.
|
|
||||||
ABIS: arm64-v8a armeabi-v7a
|
|
||||||
KEYSTORE: /tmp/solitaire-release.jks
|
KEYSTORE: /tmp/solitaire-release.jks
|
||||||
KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
|
KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
|
||||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
||||||
|
|||||||
Reference in New Issue
Block a user