ci: Fix ANDROID_NDK path

actions/runner-images#5879
openblack · Jul 26, 2022 · 4a08b58 · 4a08b58
1 parent 78c0868
commit 4a08b58
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/.github/workflows/ci-cross-compile.yml b/.github/workflows/ci-cross-compile.yml
@@ -42,8 +42,8 @@ jobs:
 
       - name: Install EMSDK
         run: |
-          git clone https://github.com/emscripten-core/emsdk /tmp/emsdk
-          pushd /tmp/emsdk
+          git clone https://github.com/emscripten-core/emsdk ${EMSDK}
+          pushd ${EMSDK}
           ./emsdk install latest
           ./emsdk activate latest
         if: matrix.preset == 'emscripten-vcpkg'
@@ -64,32 +64,20 @@ jobs:
         with:
           configurePreset: '${{ matrix.preset }}'
           configurePresetCmdString: "[`--preset`, `$[env.CONFIGURE_PRESET_NAME]`, `-DOPENBLACK_WARNINGS_AS_ERRORS=ON`]"
-        env:
-          EMSDK: '/tmp/emsdk'
-          CXX: ''
-          CC: ''
 
       - name: Run CMake+vcpkg to build (Debug).
         uses: lukka/run-cmake@v10
         with:
           configurePreset: '${{ matrix.preset }}'
           configurePresetCmdString: "[`--preset`, `$[env.CONFIGURE_PRESET_NAME]`, `-DOPENBLACK_WARNINGS_AS_ERRORS=ON`]"
           buildPreset: '${{ matrix.preset }}-debug'
-        env:
-          EMSDK: '/tmp/emsdk'
-          CXX: ''
-          CC: ''
 
       - name: Run CMake+vcpkg to build (Release).
         uses: lukka/run-cmake@v10
         with:
           configurePreset: '${{ matrix.preset }}'
           configurePresetCmdString: "[`--preset`, `$[env.CONFIGURE_PRESET_NAME]`, `-DOPENBLACK_WARNINGS_AS_ERRORS=ON`]"
           buildPreset: '${{ matrix.preset }}-release'
-        env:
-          EMSDK: '/tmp/emsdk'
-          CXX: ''
-          CC: ''
 
       - uses: actions/upload-artifact@v3
         with:
@@ -99,3 +87,7 @@ jobs:
 
     env:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
+      EMSDK: '/tmp/emsdk'
+      ANDROID_ROOT: '/usr/local/lib/android'
+      ANDROID_SDK_ROOT: "${ANDROID_ROOT}/sdk"
+      ANDROID_NDK_ROOT: "${ANDROID_SDK_ROOT}/ndk-bundle"