From f4039d0132a8bcd03fff817608eec872e66c1fde Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 3 Oct 2025 23:44:38 +0200 Subject: [PATCH] release: don't cache ndk + verify arm64 alignment --- .github/workflows/generic.yml | 2 +- .github/workflows/release.yml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generic.yml b/.github/workflows/generic.yml index 9a59e4b2d9..c74fa294e5 100644 --- a/.github/workflows/generic.yml +++ b/.github/workflows/generic.yml @@ -76,7 +76,7 @@ jobs: if: ${{ matrix.platform.android-ndk }} id: setup-ndk with: - local-cache: true + local-cache: false ndk-version: r28c - name: 'Configure Android NDK variables' if: ${{ matrix.platform.android-ndk }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13c50ec7ab..18055d7e49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -535,7 +535,7 @@ jobs: id: setup-ndk uses: nttld/setup-ndk@v1 with: - local-cache: true + local-cache: false ndk-version: r28c - name: 'Setup Java JDK' uses: actions/setup-java@v4 @@ -610,8 +610,14 @@ jobs: python "${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" -o /tmp/SDL3-android echo "prefix=/tmp/SDL3-android" >>$GITHUB_OUTPUT echo "sdl3-aar=/tmp/${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" >>$GITHUB_OUTPUT + - name: 'Verify alignment of libSDL3.so (arm64-v8a/x86_64)' + run: | + set -e + ${{ steps.src.outputs.path }}/build-scripts/check_elf_alignment.sh ${{ steps.sdk.outputs.prefix }}/lib/arm64-v8a/libSDL3.so + ${{ steps.src.outputs.path }}/build-scripts/check_elf_alignment.sh ${{ steps.sdk.outputs.prefix }}/lib/x86_64/libSDL3.so - name: 'CMake (configure + build) x86, x64, arm32, arm64' run: | + set -e android_abis="x86 x86_64 armeabi-v7a arm64-v8a" for android_abi in ${android_abis}; do echo "Configuring ${android_abi}..."