2
0
Эх сурвалжийг харах

release: don't cache ndk + verify arm64 alignment

Anonymous Maarten 1 долоо хоног өмнө
parent
commit
f4039d0132

+ 1 - 1
.github/workflows/generic.yml

@@ -76,7 +76,7 @@ jobs:
         if: ${{ matrix.platform.android-ndk }}
         if: ${{ matrix.platform.android-ndk }}
         id: setup-ndk
         id: setup-ndk
         with:
         with:
-          local-cache: true
+          local-cache: false
           ndk-version: r28c
           ndk-version: r28c
       - name: 'Configure Android NDK variables'
       - name: 'Configure Android NDK variables'
         if: ${{ matrix.platform.android-ndk }}
         if: ${{ matrix.platform.android-ndk }}

+ 7 - 1
.github/workflows/release.yml

@@ -535,7 +535,7 @@ jobs:
         id: setup-ndk
         id: setup-ndk
         uses: nttld/setup-ndk@v1
         uses: nttld/setup-ndk@v1
         with:
         with:
-          local-cache: true
+          local-cache: false
           ndk-version: r28c
           ndk-version: r28c
       - name: 'Setup Java JDK'
       - name: 'Setup Java JDK'
         uses: actions/setup-java@v4
         uses: actions/setup-java@v4
@@ -610,8 +610,14 @@ jobs:
           python "${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" -o /tmp/SDL3-android
           python "${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" -o /tmp/SDL3-android
           echo "prefix=/tmp/SDL3-android" >>$GITHUB_OUTPUT
           echo "prefix=/tmp/SDL3-android" >>$GITHUB_OUTPUT
           echo "sdl3-aar=/tmp/${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" >>$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'
       - name: 'CMake (configure + build) x86, x64, arm32, arm64'
         run: |
         run: |
+          set -e
           android_abis="x86 x86_64 armeabi-v7a arm64-v8a"
           android_abis="x86 x86_64 armeabi-v7a arm64-v8a"
           for android_abi in ${android_abis}; do
           for android_abi in ${android_abis}; do
             echo "Configuring ${android_abi}..."
             echo "Configuring ${android_abi}..."