add web; test android flags

TokisanGames · Dec 28, 2024 · bab9f11 · bab9f11
1 parent b08ac09
commit bab9f11
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/.github/actions/base-deps/action.yml b/.github/actions/base-deps/action.yml
@@ -33,3 +33,22 @@ runs:
           sudo apt-get install mingw-w64
           sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
           sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+
+    - name: Setup Web Dependencies
+      if: inputs.platform == 'web'
+      uses: mymindstorm/setup-emsdk@v14
+        env:
+          EM_VERSION: 3.1.64
+          EM_CACHE_FOLDER: emsdk-cache
+        with:
+          version: ${{ env.EM_VERSION }}
+          actions-cache-folder: ${{ env.EM_CACHE_FOLDER }}
+          cache-key: emsdk-${{ matrix.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}
+          # no-cache: true
+
+
+    - name: Verify Emscripten setup
+      if: inputs.platform == 'web'
+      shell: bash
+      run: |
+        emcc -v
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,44 +19,50 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        identifier: [linux, windows, macos, ios, android-arm32, android-arm64]
+        identifier: [linux, windows, macos, ios, android, web]
         target: [debug, release]
         include:
           - identifier: linux
             platform: linux
             name: 🐧 Linux
             runner: ubuntu-22.04
-            arch: x86_64
+            flags: arch=x86_64
 
           - identifier: windows
             platform: windows
             name: 🪟 Windows
             runner: ubuntu-22.04
-            arch: x86_64
+            flags: arch=x86_64
 
           - identifier: macos
             platform: macos
             name: 🍎 macOS
             runner: macos-latest
-            arch: universal
+            flags: arch=universal
 
           - identifier: ios
             platform: ios
             name: 🍏 iOS
             runner: macos-latest
-            arch: universal
+            flags: arch=universal
 
-          - identifier: android-arm64
+          # - identifier: android-arm32
+          #   platform: android
+          #   name: 🤖 Android Arm32
+          #   runner: ubuntu-22.04
+          #   arch: arm32
+
+          - identifier: android
             platform: android
             name: 🤖 Android Arm64
             runner: ubuntu-22.04
-            arch: arm64
+            flags: [arch=arm64, arch=arm32]
 
-          - identifier: android-arm32
-            platform: android
-            name: 🤖 Android Arm32
+          - identifier: web
+            platform: web
+            name: 🌐 Web
             runner: ubuntu-22.04
-            arch: arm32
+            flags: threads=no
 
     steps:
       - name: Checkout Terrain3D
@@ -82,7 +88,7 @@ jobs:
             ARCH: '${{ matrix.arch }}'
         shell: sh
         run: |
-            scons target=$TARGET platform='${{ matrix.platform }}' arch=$ARCH debug_symbols=no -j2
+            scons target=$TARGET platform='${{ matrix.platform }}' ${{ matrix.flags }} debug_symbols=no -j2
 
       - name: Strip Libraries (Windows/Linux)
         if: ${{ matrix.platform == 'windows' || matrix.platform == 'linux' }}

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -4,7 +4,7 @@ on: [ push, workflow_call, workflow_dispatch ]
 jobs:
   build:
     name: 🌐 Web ${{ matrix.arch }} ${{ matrix.target }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix: