armeabi-v7a building should work now.

./build.sh --abi arm64-v8a
./build.sh --abi armeabi-v7a

arm64-v8a is default.
This commit is contained in:
mschiller890
2026-03-20 09:31:34 +01:00
parent 70a45fb446
commit 017d908c54
2 changed files with 120 additions and 29 deletions

View File

@@ -101,8 +101,15 @@ jobs:
${{github.workspace}}/build/MinecraftPE-server
build-android: # pray to god
name: Build Android APK
name: Build Android APK (${{ matrix.abi }})
runs-on: ubuntu-latest
strategy:
# keep going with the other ABI if one fails so you at least get something useful
fail-fast: false
matrix:
abi: [ arm64-v8a, armeabi-v7a ]
env:
ANDROID_SDK_ROOT: ${{ github.workspace }}/android-sdk
# ANDROID_NDK_PATH: ${{ env.ANDROID_NDK_PATH }}
@@ -110,6 +117,9 @@ jobs:
ANDROID_BUILD_TOOLS_VERSION: 36.0.0
ADB: /bin/true
# JAVA_HOME: ${{ env.JAVA_HOME }}
# build.sh reads MATRIX_ABI to decide which ABI to build when no --abi flag is passed
MATRIX_ABI: ${{ matrix.abi }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -166,6 +176,7 @@ jobs:
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
echo "ANDROID_NDK_PATH=$ANDROID_NDK_PATH"
echo "JAVA_HOME=$JAVA_HOME"
echo "MATRIX_ABI=$MATRIX_ABI"
$ANDROID_SDK_ROOT/platform-tools/adb version || true
java -version
javac -version
@@ -178,8 +189,9 @@ jobs:
- name: Upload APK
uses: actions/upload-artifact@v4
with:
name: minecraftpe-apk
path: ${{ github.workspace }}/build-apk/minecraftpe-debug.apk
# artifact name is ABI-specific so both matrix legs can upload without clobbering each other
name: minecraftpe-apk-${{ matrix.abi }}
path: ${{ github.workspace }}/build-apk/minecraftpe-*-debug.apk
publish:
name: Publish
@@ -217,11 +229,17 @@ jobs:
files: mcpe-linux/MinecraftPE-server
dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
- name: Zip Android Artifact
- name: Zip Android arm64-v8a Artifact
uses: vimtor/action-zip@v1.2
with:
files: minecraftpe-apk/minecraftpe-debug.apk
dest: minecraftpe-${{ steps.ref.outputs.hash }}-android.zip
files: minecraftpe-apk-arm64-v8a/minecraftpe-v8a-debug.apk
dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
- name: Zip Android armeabi-v7a Artifact
uses: vimtor/action-zip@v1.2
with:
files: minecraftpe-apk-armeabi-v7a/minecraftpe-v7a-debug.apk
dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
- name: Update Development Release
uses: andelf/nightly-release@main
@@ -236,4 +254,5 @@ jobs:
./minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
./minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
./minecraftpe-${{ steps.ref.outputs.hash }}-android.zip
./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip