Merge pull request #45133 from akien-mga/3.2-ci-android-ndk-pin-r21

[3.2] CI: Pin Android NDK r21 as we don't support r22 yet
This commit is contained in:
Rémi Verschelde 2021-01-12 19:32:27 +01:00 committed by GitHub
commit 2583624f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,6 +6,7 @@ env:
GODOT_BASE_BRANCH: 3.2 GODOT_BASE_BRANCH: 3.2
SCONSFLAGS: platform=android verbose=yes warnings=all werror=yes --jobs=2 SCONSFLAGS: platform=android verbose=yes warnings=all werror=yes --jobs=2
SCONS_CACHE_LIMIT: 4096 SCONS_CACHE_LIMIT: 4096
ANDROID_NDK_VERSION: 21.1.6352462
jobs: jobs:
android-template: android-template:
@ -28,6 +29,10 @@ jobs:
with: with:
java-version: 8 java-version: 8
- name: Install Android NDK r21
run: |
sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install 'ndk;${{env.ANDROID_NDK_VERSION}}'
# Upload cache on completion and check it out now # Upload cache on completion and check it out now
- name: Load .scons_cache directory - name: Load .scons_cache directory
id: android-template-cache id: android-template-cache
@ -59,7 +64,7 @@ jobs:
- name: Compilation - name: Compilation
env: env:
SCONS_CACHE: ${{github.workspace}}/.scons_cache/ SCONS_CACHE: ${{github.workspace}}/.scons_cache/
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk-bundle ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/${{env.ANDROID_NDK_VERSION}}/
run: | run: |
scons target=release tools=no android_arch=armv7 scons target=release tools=no android_arch=armv7
scons target=release tools=no android_arch=arm64v8 scons target=release tools=no android_arch=arm64v8