github: Remove wasm32...custom target

Removes the -custom target in favor of passing args to the wasm32 build
Pipelines the Wasm testing better
Adds a Wasm32 Xbox build too

Author: hbirchtree

.cmake/CMakePresets.wasm.json

@@ -63,14 +63,6 @@
             "displayName": "Wasm32 for Web + WebGL2 (SDL2)",
             "inherits": ["vcpkg-base-emscripten"]
         },
-        {
-            "name": "web-wasm32-emscripten-webgl2-custom",
-            "displayName": "Wasm32 for Web + WebGL2 (SDL2)",
-            "inherits": ["vcpkg-base-emscripten"],
-            "cacheVariables": {
-                "BLAM_HALO_VERSION": "custom_version_t"
-            }
-        },
         {
             "name": "web-wasm64-emscripten-webgl2",
             "displayName": "Wasm64 for Web + WebGL2 (SDL2)",
@@ -96,18 +88,6 @@
             "configurePreset": "web-wasm32-emscripten-webgl2",
             "inherits": "base-linux"
         },
-        {
-            "name": "web-wasm32-emscripten-webgl2-custom-dbg",
-            "environment": {"BUILD_TYPE":"Debug"},
-            "configurePreset": "web-wasm32-emscripten-webgl2-custom",
-            "inherits": "base-linux"
-        },
-        {
-            "name": "web-wasm32-emscripten-webgl2-custom-rel",
-            "environment": {"BUILD_TYPE":"Release"},
-            "configurePreset": "web-wasm32-emscripten-webgl2-custom",
-            "inherits": "base-linux"
-        },
         {
             "name": "web-wasm64-emscripten-webgl2-dbg",
             "environment": {"BUILD_TYPE":"Debug"},

.github/actions/build-project/action.yml

@@ -11,14 +11,18 @@ inputs:
     description: Optional URL passed as EMBEDDED_REPORT_URL to the build
     required: false
     default: ''
+  args:
+    description: Additional CMake build args
+    required: false
+    default: ''
 runs:
   using: composite
   steps:
     - name: Building project
       id: buildProject
       continue-on-error: true
       shell: bash
-      run: source/cb build ${{ inputs.variant }}/install
+      run: source/cb build ${{ inputs.variant }}/install -- ${{ inputs.args }}
       env:
         BUILD_HOST_TOOLS: no
         EMBEDDED_REPORT_URL: ${{ inputs.embedded_report_url }}

.github/workflows/10-compile.yml

@@ -65,12 +65,6 @@ jobs:
           artifact: desktop-x86_64-buildroot-linux-gnu-multi
         - variant: desktop:x86_64-w64-mingw32:posix:rel
           artifact: desktop-x86_64-w64-mingw32-posix
-        - variant: web:wasm32-emscripten:webgl2:rel
-          artifact: web-wasm32-emscripten-webgl2
-        - variant: web:wasm32-emscripten:webgl2-custom:rel
-          artifact: web-wasm32-emscripten-webgl2-custom
-        - variant: web:wasm64-emscripten:webgl2:rel
-          artifact: web-wasm64-emscripten-webgl2
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       MAP_ACCESS_TOKEN: ${{ secrets.MAP_ACCESS_TOKEN }}
@@ -124,6 +118,62 @@ jobs:
           !source/multi_build/${{matrix.artifact}}/install/lib/*.a
           source/multi_build/${{matrix.artifact}}/install/packaged
         if-no-files-found: error
+  WebAssembly:
+    runs-on: ubuntu-latest
+    needs: Linux_HostTools
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - variant: web:wasm32-emscripten:webgl2:rel
+          build: web-wasm32-emscripten-webgl2
+          args: ''
+          artifact: web-wasm32-emscripten-webgl2
+        - variant: web:wasm32-emscripten:webgl2:rel
+          build: web-wasm32-emscripten-webgl2
+          args: '-DBLAM_HALO_VERSION=custom_version_t'
+          artifact: web-wasm32-emscripten-webgl2-custom
+        - variant: web:wasm32-emscripten:webgl2:rel
+          build: web-wasm32-emscripten-webgl2
+          args: '-DBLAM_HALO_VERSION=xbox_version_t'
+          artifact: web-wasm32-emscripten-webgl2-xbox
+        - variant: web:wasm64-emscripten:webgl2:rel
+          build: web-wasm64-emscripten-webgl2
+          args: ''
+          artifact: web-wasm64-emscripten-webgl2
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      MAP_ACCESS_TOKEN: ${{ secrets.MAP_ACCESS_TOKEN }}
+    name: ${{ matrix.variant }}
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        submodules: true
+        path: source
+    - uses: ./source/.github/actions/cmake-setup
+    - name: Installing build-essential
+      run: |
+        sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+        sudo apt-get update
+        sudo apt install build-essential inkscape nasm
+    - name: Host tools cache
+      uses: actions/cache@v5
+      with:
+        path: source/multi_build/host-x64-linux-native
+        key: host-tools-${{ runner.os }}-${{ hashFiles('source/tools','toolchain/building.py','vcpkg.json','vcpkg-configuration.json') }}
+        fail-on-cache-miss: true
+    - uses: ./source/.github/actions/build-project
+      with:
+        variant: ${{ matrix.variant }}
+        artifact: ${{ matrix.artifact }}
+        args: ${{ matrix.args }}
+        embedded_report_url: "https://reports.speen.dev"
+    - name: Uploading artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        name: ${{matrix.artifact}}
+        path: source/multi_build/${{matrix.build}}/install/bin
+        if-no-files-found: error
   macOS_HostTools:
     runs-on: macos-latest
     needs: Release
@@ -256,7 +306,7 @@ jobs:
   Test_wasm_swiftshader:
     if: ${{ always() }}
     name: "Software render test (SwiftShader, ${{ matrix.variant }}-emscripten, WebGL2)"
-    needs: Linux
+    needs: WebAssembly
     runs-on: ubuntu-latest
     permissions:
       actions: read