Browse Source

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.

(cherry picked from commit eea33b413361ef023cddfaa03d9f5acb60538006)
Rémi Verschelde 1 year ago
parent
commit
c8096d4668
1 changed files with 20 additions and 9 deletions
  1. 20 9
      .github/workflows/ci.yml

+ 20 - 9
.github/workflows/ci.yml

@@ -60,7 +60,8 @@ jobs:
             platform: android
             artifact-name: godot-cpp-android-arm64-release
             artifact-path: bin/libgodot-cpp.android.template_release.arm64.a
-            flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
+            flags: arch=arm64
+            run-tests: false
             cache-name: android-arm64
 
           - name: 🍏 iOS (arm64)
@@ -73,6 +74,8 @@ jobs:
 
     env:
       SCONS_CACHE: ${{ github.workspace }}/.scons-cache/
+      EM_VERSION: 3.1.39
+      EM_CACHE_FOLDER: "emsdk-cache"
 
     steps:
       - name: Checkout
@@ -91,15 +94,19 @@ jobs:
         with:
           python-version: '3.x'
 
-      - name: Linux dependencies
-        if: ${{ matrix.platform == 'linux' }}
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qqq build-essential pkg-config
+      - name: Android dependencies
+        if: ${{ matrix.platform == 'android' }}
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23c
+          link-to-sdk: true
 
-      - name: Install scons
-        run: |
-          python -m pip install scons==4.0.0
+      - name: Web dependencies
+        if: ${{ matrix.platform == 'web' }}
+        uses: mymindstorm/setup-emsdk@v12
+        with:
+          version: ${{env.EM_VERSION}}
+          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
 
       - name: Setup MinGW for Windows/MinGW build
         if: ${{ matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes' }}
@@ -107,6 +114,10 @@ jobs:
         with:
           version: 12.2.0
 
+      - name: Install scons
+        run: |
+          python -m pip install scons==4.0.0
+
       - name: Generate godot-cpp sources only
         run: |
           scons platform=${{ matrix.platform }} build_library=no ${{ matrix.flags }}