Skip to content

Commit fec1dd4

Browse files
committed
release: don't cache ndk + verify arm64 alignment
(cherry picked from commit f4039d0)
1 parent 2a3a8f7 commit fec1dd4

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/generic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
if: ${{ matrix.platform.android-ndk }}
7676
id: setup-ndk
7777
with:
78-
local-cache: true
78+
local-cache: false
7979
ndk-version: r28c
8080
- name: 'Configure Android NDK variables'
8181
if: ${{ matrix.platform.android-ndk }}

.github/workflows/release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ jobs:
534534
- name: 'Setup Android NDK'
535535
uses: nttld/setup-ndk@v1
536536
with:
537-
local-cache: true
537+
local-cache: false
538538
ndk-version: r28c
539539
- name: 'Setup Java JDK'
540540
uses: actions/setup-java@v4
@@ -607,8 +607,14 @@ jobs:
607607
python "${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" -o /tmp/SDL3-android
608608
echo "prefix=/tmp/SDL3-android" >>$GITHUB_OUTPUT
609609
echo "sdl3-aar=/tmp/${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" >>$GITHUB_OUTPUT
610+
- name: 'Verify alignment of libSDL3.so (arm64-v8a/x86_64)'
611+
run: |
612+
set -e
613+
${{ steps.src.outputs.path }}/build-scripts/check_elf_alignment.sh ${{ steps.sdk.outputs.prefix }}/lib/arm64-v8a/libSDL3.so
614+
${{ steps.src.outputs.path }}/build-scripts/check_elf_alignment.sh ${{ steps.sdk.outputs.prefix }}/lib/x86_64/libSDL3.so
610615
- name: 'CMake (configure + build) x86, x64, arm32, arm64'
611616
run: |
617+
set -e
612618
android_abis="x86 x86_64 armeabi-v7a arm64-v8a"
613619
for android_abi in ${android_abis}; do
614620
echo "Configuring ${android_abi}..."

0 commit comments

Comments
 (0)