diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4f61975..70d1a32b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,13 +23,13 @@ jobs: - identifier: linux platform: linux name: 🐧 Linux - runner: ubuntu-latest + runner: ubuntu-20.04 arch: x86_64 - identifier: windows platform: windows name: 🪟 Windows - runner: ubuntu-latest + runner: ubuntu-20.04 arch: x86_64 - identifier: macos @@ -44,17 +44,17 @@ jobs: runner: macos-latest arch: universal - - identifier: android + - identifier: android-arm64 platform: android - name: 🤖 Android Arm - runner: ubuntu-latest - arch: [arm64, arm32] + name: 🤖 Android Arm64 + runner: ubuntu-20.04 + arch: arm64 - - identifier: web - platform: web - name: 🌐 Web - runner: ubuntu-latest - threads: [yes, no] + - identifier: android-arm32 + platform: android + name: 🤖 Android Arm32 + runner: ubuntu-20.04 + arch: arm32 steps: - name: Checkout Terrain3D @@ -73,10 +73,6 @@ jobs: ndk-version: r23c link-to-sdk: true - - name: Setup Web Dependencies - if: ${{ matrix.platform == 'web' }} - uses: ./.github/actions/web-deps - - name: Setup Base Dependencies uses: ./.github/actions/base-deps @@ -88,14 +84,12 @@ jobs: - name: Build Terrain3D env: - if: ${{ matrix.platform != 'web' }} SCONS_CACHE: "${{ github.workspace }}/.scons-cache/" TARGET: 'template_${{ matrix.target }}' - ARCH: 'arch=${{ matrix.arch }}' - THREADS: 'threads=${{ matrix.threads }}' + ARCH: '${{ matrix.arch }}' shell: sh run: | - scons target=$TARGET platform='${{ matrix.platform }}' $ARCH $THREADS debug_symbols=no -j2 + scons target=$TARGET platform='${{ matrix.platform }}' arch=$ARCH debug_symbols=no -j2 - name: Strip Libraries (Windows/Linux) if: ${{ matrix.platform == 'windows' || matrix.platform == 'linux' }}