Update actions

TokisanGames · Nov 28, 2023 · 4e99aac · 4e99aac
1 parent 25ff77c
commit 4e99aac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 35 deletions.
diff --git a/.github/actions/run-scons/action.yml b/.github/actions/run-scons/action.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -76,6 +76,13 @@ jobs:
       - name: Setup Windows Dependencies
         if: startsWith(matrix.identifier, 'windows-')
         uses: ./.github/actions/windows-deps
+
+      - name: Setup Android dependencies
+        if: startsWith(matrix.identifier, 'android-')
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23c
+          link-to-sdk: true
 
       - name: Setup Base Dependencies
         uses: ./.github/actions/base-deps
@@ -87,7 +94,11 @@ jobs:
         continue-on-error: true
 
       - name: Build Terrain3D
-        uses: ./.github/actions/run-scons
+        env:
+            SCONS_CACHE: "${{ github.workspace }}/.scons-cache/"
+        shell: sh
+        run: |
+            scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='${{ matrix.arch }}' debug_symbols=no -j2
 
       - name: Strip Libraries (Windows/Linux)
         if: startsWith(matrix.identifier, 'windows-') || startsWith(matrix.identifier, 'linux-')

diff --git a/Terrain3D.vcxproj b/Terrain3D.vcxproj
@@ -169,7 +169,6 @@
   <ItemGroup>
     <None Include=".github\actions\base-deps\action.yml" />
     <None Include=".github\actions\build-cache\action.yml" />
-    <None Include=".github\actions\run-scons\action.yml" />
     <None Include=".github\actions\windows-deps\action.yml" />
     <None Include=".github\workflows\android.yml" />
     <None Include=".github\workflows\build.yml" />