diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-11-21 00:00:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 00:00:26 +0100 |
| commit | fa10d1a303562f002ad9db927143b6ed1b327f31 (patch) | |
| tree | d895652d1af313af3f0b32e9a2798ffd2b256311 | |
| parent | 7cd79e4cc64ce484ba04d1919da7d4cd39aab5ff (diff) | |
| parent | eea33b413361ef023cddfaa03d9f5acb60538006 (diff) | |
| download | redot-cpp-fa10d1a303562f002ad9db927143b6ed1b327f31.tar.gz | |
Merge pull request #1314 from akien-mga/ci-android-ndk-r23c
CI: Install Android NDK r23c explicitly
| -rw-r--r-- | .github/workflows/ci.yml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ee04d9..c9560e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ 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 @@ -88,7 +88,7 @@ jobs: env: SCONS_CACHE: ${{ github.workspace }}/.scons-cache/ - EM_VERSION: 3.1.45 + EM_VERSION: 3.1.39 EM_CACHE_FOLDER: "emsdk-cache" steps: @@ -108,11 +108,12 @@ 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: Web dependencies if: ${{ matrix.platform == 'web' }} @@ -121,16 +122,16 @@ jobs: version: ${{env.EM_VERSION}} actions-cache-folder: ${{env.EM_CACHE_FOLDER}} - - name: Install scons - run: | - python -m pip install scons==4.0.0 - - name: Setup MinGW for Windows/MinGW build if: ${{ matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes' }} uses: egor-tensin/setup-mingw@v2 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 }} |