Skip to content

Commit eea33b4

Browse files
committed
CI: Install Android NDK r23c explicitly
It has just been removed from the Ubuntu 20.04 default install, breaking our CI setup. Also, sets Emscripten version to 3.1.39, as done upstream. Newer versions actually break dynamic library support.
1 parent 7cd79e4 commit eea33b4

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
platform: android
6666
artifact-name: godot-cpp-android-arm64-release
6767
artifact-path: bin/libgodot-cpp.android.template_release.arm64.a
68-
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
68+
flags: arch=arm64
6969
run-tests: false
7070
cache-name: android-arm64
7171

@@ -88,7 +88,7 @@ jobs:
8888

8989
env:
9090
SCONS_CACHE: ${{ github.workspace }}/.scons-cache/
91-
EM_VERSION: 3.1.45
91+
EM_VERSION: 3.1.39
9292
EM_CACHE_FOLDER: "emsdk-cache"
9393

9494
steps:
@@ -108,11 +108,12 @@ jobs:
108108
with:
109109
python-version: '3.x'
110110

111-
- name: Linux dependencies
112-
if: ${{ matrix.platform == 'linux' }}
113-
run: |
114-
sudo apt-get update -qq
115-
sudo apt-get install -qqq build-essential pkg-config
111+
- name: Android dependencies
112+
if: ${{ matrix.platform == 'android' }}
113+
uses: nttld/setup-ndk@v1
114+
with:
115+
ndk-version: r23c
116+
link-to-sdk: true
116117

117118
- name: Web dependencies
118119
if: ${{ matrix.platform == 'web' }}
@@ -121,16 +122,16 @@ jobs:
121122
version: ${{env.EM_VERSION}}
122123
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
123124

124-
- name: Install scons
125-
run: |
126-
python -m pip install scons==4.0.0
127-
128125
- name: Setup MinGW for Windows/MinGW build
129126
if: ${{ matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes' }}
130127
uses: egor-tensin/setup-mingw@v2
131128
with:
132129
version: 12.2.0
133130

131+
- name: Install scons
132+
run: |
133+
python -m pip install scons==4.0.0
134+
134135
- name: Generate godot-cpp sources only
135136
run: |
136137
scons platform=${{ matrix.platform }} build_library=no ${{ matrix.flags }}

0 commit comments

Comments
 (0)