From 44040dda06230e8e9e9173ce314aeb1a4a857bc1 Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Sat, 16 Nov 2024 22:02:30 +0100
Subject: [PATCH 1/6] GHA: Build Windows binaries using MinGW/GCC in a docker
 container

---
 .../build-dotnet-assemblies/action.yml        |   5 +-
 .github/workflows/linux.yml                   |   5 +-
 .github/workflows/macos.yml                   |   5 +-
 .github/workflows/windows.yml                 | 159 +++++++++++++-----
 4 files changed, 131 insertions(+), 43 deletions(-)

diff --git a/.github/actions/build-dotnet-assemblies/action.yml b/.github/actions/build-dotnet-assemblies/action.yml
index acbf053..363ba4a 100644
--- a/.github/actions/build-dotnet-assemblies/action.yml
+++ b/.github/actions/build-dotnet-assemblies/action.yml
@@ -8,6 +8,9 @@ inputs:
       - linuxbsd
       - windows
       - macos
+  bin:
+    required: true
+    type: string
 
 runs:
   using: "composite"
@@ -22,7 +25,7 @@ runs:
     - name: Generate C# glue
       shell: bash
       run: |
-        ./bin/${BIN} --headless --generate-mono-glue ./modules/mono/glue || true
+        ./bin/${{inputs.bin}} --headless --generate-mono-glue ./modules/mono/glue || true
 
     - name: Build .NET assemblies
       shell: bash
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index a107cc0..fa02103 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -11,7 +11,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Should we perform only a limited number of test builds?
+        description: Limit to pre-defined test builds
         type: boolean
         default: false
 
@@ -26,7 +26,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Should we perform only a limited number of test builds?
+        description: Limit to pre-defined test builds
         type: boolean
         default: false
 
@@ -248,6 +248,7 @@ jobs:
         uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
         with:
           platform: linuxbsd
+          bin: ${{env.BIN}}
 
       - name: Prepare artifact
         env:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 15500fc..a737c41 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -11,7 +11,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Should we perform only a limited number of test builds?
+        description: Limit to pre-defined test builds
         type: boolean
         default: false
 
@@ -26,7 +26,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Should we perform only a limited number of test builds?
+        description: Limit to pre-defined test builds
         type: boolean
         default: false
 
@@ -195,6 +195,7 @@ jobs:
         uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
         with:
           platform: macos
+          bin: ${{env.BIN}}
 
       - name: Prepare artifact
         run: |
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 83c4486..be67924 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -5,13 +5,13 @@ on:
       godot-ref:
         description: A tag, branch or commit hash in the Godot repository.
         type: string
-        default: master
+        default: 4.3
       limboai-ref:
         description: A tag, branch or commit hash in the LimboAI repository.
         type: string
         default: master
       test-build:
-        description: Should we perform only a limited number of test builds?
+        description: Limit to pre-defined test builds
         type: boolean
         default: false
 
@@ -20,28 +20,28 @@ on:
       godot-ref:
         description: A tag, branch or commit hash in the Godot repository.
         type: string
-        default: master
+        default: 4.3
       limboai-ref:
         description: A tag, branch or commit hash in the LimboAI repository.
         type: string
         default: master
       test-build:
-        description: Should we perform only a limited number of test builds?
+        description: Limit to pre-defined test builds
         type: boolean
         default: false
 
 # Global Settings
 env:
-  SCONS_CACHE_MSVC_CONFIG: true
+  BUILD_IMAGE_VERSION: 4.3-f40
   SCONS_CACHE_LIMIT: 4096
-  SCONSFLAGS: production=yes tests=no verbose=yes warnings=extra werror=yes
-  DOTNET_NOLOGO: true
-  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  SCONSFLAGS: production=yes use_mingw=yes verbose=yes warnings=no progress=no
 
 jobs:
   windows-builds:
-    runs-on: "windows-latest"
+    runs-on: "ubuntu-24.04"
     name: ${{ matrix.opts.name }}
+    outputs:
+      built-dotnet-editor: ${{ steps.mark-dotnet-editor.outputs.built-dotnet-editor }}
     strategy:
       fail-fast: false
       matrix:
@@ -51,18 +51,21 @@ jobs:
           - name: Editor (x86_64, release)
             target: editor
             arch: x86_64
+            llvm: false
             dotnet: false
             should-build: true
 
           - name: Template (x86_64, release)
             target: template_release
             arch: x86_64
+            llvm: false
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
           - name: Template (x86_64, debug)
             target: template_debug
             arch: x86_64
+            llvm: false
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
@@ -71,18 +74,21 @@ jobs:
           # - name: Editor (x86_32, release)
           #   target: editor
           #   arch: x86_32
+          #   llvm: false
           #   dotnet: false
           # should-build: ${{ !inputs.test-build }}
 
           - name: Template (x86_32, release)
             target: template_release
             arch: x86_32
+            llvm: false
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
           - name: Template (x86_32, debug)
             target: template_debug
             arch: x86_32
+            llvm: false
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
@@ -91,19 +97,24 @@ jobs:
           # - name: Editor (arm64, release)
           #   target: editor
           #   arch: arm64
+          #   llvm: true
           #   dotnet: false
           #   should-build: ${{ !inputs.test-build }}
 
           - name: Template (arm64, release)
             target: template_release
             arch: arm64
+            llvm: true
             dotnet: false
+            scons-flags: mingw_prefix=/root/llvm-mingw
             should-build: ${{ !inputs.test-build }}
 
           - name: Template (arm64, debug)
             target: template_debug
             arch: arm64
+            llvm: true
             dotnet: false
+            scons-flags: mingw_prefix=/root/llvm-mingw
             should-build: ${{ !inputs.test-build }}
 
           # * .NET x86_64
@@ -111,18 +122,21 @@ jobs:
           - name: Editor .NET (x86_64, release)
             target: editor
             arch: x86_64
+            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
           - name: Template .NET (x86_64, release)
             target: template_release
             arch: x86_64
+            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
           - name: Template .NET (x86_64, debug)
             target: template_debug
             arch: x86_64
+            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
@@ -131,46 +145,54 @@ jobs:
           # - name: Editor .NET (x86_32, release)
           #   target: editor
           #   arch: x86_32
+          #   llvm: false
           #   dotnet: true
           # should-build: ${{ !inputs.test-build }}
 
           - name: Template .NET (x86_32, release)
             target: template_release
             arch: x86_32
+            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
           - name: Template .NET (x86_32, debug)
             target: template_debug
             arch: x86_32
+            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
             # * .NET arm64
 
-          # - name: Editor (arm64, release)
+          # - name: Editor .NET (arm64, release)
           #   target: editor
           #   arch: arm64
+          #   llvm: true
           #   dotnet: true
           #   should-build: ${{ !inputs.test-build }}
 
-          - name: Template (arm64, release)
+          - name: Template .NET (arm64, release)
             target: template_release
             arch: arm64
+            llvm: true
             dotnet: true
+            scons-flags: mingw_prefix=/root/llvm-mingw
             should-build: ${{ !inputs.test-build }}
 
-          - name: Template (arm64, debug)
+          - name: Template .NET (arm64, debug)
             target: template_debug
             arch: arm64
+            llvm: true
             dotnet: true
+            scons-flags: mingw_prefix=/root/llvm-mingw
             should-build: ${{ !inputs.test-build }}
 
         exclude:
           - { opts: { should-build: false } }
 
     env:
-      BIN: godot.windows.${{matrix.opts.target}}.${{matrix.opts.arch}}${{  matrix.opts.dotnet == true && '.mono' || ''  }}
+      BIN: godot.windows.${{matrix.opts.target}}.${{matrix.opts.arch}}${{matrix.opts.llvm && '.llvm' || ''}}${{matrix.opts.dotnet == true && '.mono' || ''}}
 
     steps:
       - name: Clone Godot
@@ -188,23 +210,8 @@ jobs:
       # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
       - uses: ./modules/limboai/.github/actions/init-version
 
-      - name: Set up Python 3.x
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-          architecture: "x64"
-
-      - name: Set up scons
-        run: |
-          python -c "import sys; print(sys.version)"
-          python -m pip install scons==4.4.0
-          python --version
-          scons --version
-
-      - name: Set up MSVC problem matcher
-        uses: ammaraskar/msvc-problem-matcher@master
-
       - name: Set up scons cache
+        if: inputs.test-build # ! Only cache test/PR builds
         uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
@@ -214,17 +221,34 @@ jobs:
             ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
             ${{env.BIN}}-${{inputs.godot-ref}}
 
-      - name: Compilation
-        env:
-          SCONS_CACHE: ${{github.workspace}}/.scons_cache/
+      - name: Pull build container
         run: |
-          scons -j2 platform=windows target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} module_mono_enabled=${{matrix.opts.dotnet}} ${{env.SCONSFLAGS}}
+          podman pull ghcr.io/limbonaut/godot-windows:${{env.BUILD_IMAGE_VERSION}}
 
-      - name: Build .NET assemblies
-        if: matrix.opts.dotnet && matrix.opts.target == 'editor'
-        uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
-        with:
-          platform: windows
+      - name: Build using container
+        shell: bash
+        run: |
+          scons_command="scons \
+              platform=windows \
+              target=${{matrix.opts.target}} \
+              arch=${{matrix.opts.arch}} \
+              use_llvm=${{matrix.opts.llvm}} \
+              module_mono_enabled=${{matrix.opts.dotnet}} \
+              ${{env.SCONSFLAGS}} \
+              ${{matrix.opts.scons-flags}} \
+          "
+          podman_run="podman run -it --rm \
+            --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} \
+            --env NUM_CORES=$(nproc --all) \
+            --env SCONS_CACHE_LIMIT=${SCONS_CACHE_LIMIT} \
+            --env DOTNET_NOLOGO=true \
+            --env DOTNET_CLI_TELEMETRY_OPTOUT=true \
+            --env SCONS_CACHE=${{github.workspace}}/.scons_cache/
+            -v ${GITHUB_WORKSPACE}/:/build/ \
+            -w /build godot-windows:${{env.BUILD_IMAGE_VERSION}} bash -c \
+          "
+          echo "Running ${podman_run} \"${scons_command}\""
+          ${podman_run} "${scons_command}"
 
       - name: Prepare artifact
         shell: bash
@@ -252,3 +276,62 @@ jobs:
         with:
           name: ${{env.NAME_PREFIX}}${{matrix.opts.dotnet == true && '.dotnet' || ''}}.${{matrix.opts.target}}.windows.${{matrix.opts.arch}}
           path: out/*
+
+      - name: Mark .NET editor as built
+        if: matrix.opts.dotnet && matrix.opts.target == 'editor'
+        id: mark-dotnet-editor
+        run: echo "built-dotnet-editor=true" >> $GITHUB_OUTPUT
+
+
+  dotnet-assemblies:
+    name: .NET assembly for ${{matrix.opts.arch}}
+    needs: windows-builds
+    if: always() && needs.windows-builds.outputs.built-dotnet-editor == 'true'
+    runs-on: "windows-latest"
+    strategy:
+      fail-fast: false
+      matrix:
+        opts:
+          - arch: x86_64
+            llvm: false
+    env:
+      BIN: godot.windows.editor.${{matrix.opts.arch}}${{matrix.opts.llvm && '.llvm' || ''}}.mono
+    steps:
+      - name: Clone Godot
+        uses: actions/checkout@v4
+        with:
+          repository: godotengine/godot
+          ref: ${{ inputs.godot-ref }}
+
+      - name: Clone LimboAI module
+        uses: actions/checkout@v4
+        with:
+          path: modules/limboai
+          ref: ${{ inputs.limboai-ref }}
+
+      # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
+      - uses: ./modules/limboai/.github/actions/init-version
+
+      - name: Reconstruct artifact name
+        shell: bash
+        run: |
+          echo "ARTIFACT=${{env.NAME_PREFIX}}.dotnet.editor.windows.${{matrix.opts.arch}}" >> $GITHUB_ENV
+
+      - name: Download editor artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{env.ARTIFACT}}
+          path: bin/
+
+      - name: Build .NET assemblies
+        uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
+        with:
+          platform: windows
+          bin: ${{env.BIN}}
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.ARTIFACT}}
+          overwrite: true
+          path: bin/*

From 6d79b7474ece5e871316d00b79ece69acfc0f817 Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Sun, 1 Dec 2024 15:20:13 +0100
Subject: [PATCH 2/6] GHA: Don't use SCons cache in release builds

---
 .github/workflows/android.yml     | 19 ++++++++++---------
 .github/workflows/gdextension.yml |  5 +++--
 .github/workflows/ios.yml         | 19 ++++++++++---------
 .github/workflows/linux.yml       |  1 +
 .github/workflows/macos.yml       |  1 +
 .github/workflows/web.yml         | 19 ++++++++++---------
 6 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 1bd4398..1f81d2e 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -165,15 +165,16 @@ jobs:
           python --version
           scons --version
 
-      - name: Set up scons cache
-        uses: actions/cache@v4
-        with:
-          path: ${{github.workspace}}/.scons_cache/
-          key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-          restore-keys: |
-            ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-            ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
-            ${{env.BIN}}-${{inputs.godot-ref}}
+      # ! Note: we stopped using the scons cache in release builds.
+      # - name: Set up scons cache
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: ${{github.workspace}}/.scons_cache/
+      #     key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+      #     restore-keys: |
+      #       ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+      #       ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
+      #       ${{env.BIN}}-${{inputs.godot-ref}}
 
       - name: Compilation
         env:
diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml
index dc3d82a..b784816 100644
--- a/.github/workflows/gdextension.yml
+++ b/.github/workflows/gdextension.yml
@@ -11,7 +11,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Limit the number of test builds
+        description: Limit to pre-defined test builds
         type: boolean
         default: false
       debug-symbols:
@@ -30,7 +30,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Limit the number of test builds
+        description: Limit to pre-defined test builds
         type: boolean
         default: false
       debug-symbols:
@@ -285,6 +285,7 @@ jobs:
         uses: ammaraskar/msvc-problem-matcher@master
 
       - name: Set up scons cache
+        if: inputs.test-build # ! Only cache test/PR builds
         uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index ce4cbb9..d256d2a 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -145,15 +145,16 @@ jobs:
           rm -Rf /tmp/InstallVulkan.app
           rm -f /tmp/vulkan-sdk.zip
 
-      - name: Set up scons cache
-        uses: actions/cache@v4
-        with:
-          path: ${{github.workspace}}/.scons_cache/
-          key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-          restore-keys: |
-            ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-            ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
-            ${{env.BIN}}-${{inputs.godot-ref}}
+      # ! Note: we stopped using the scons cache in release builds.
+      # - name: Set up scons cache
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: ${{github.workspace}}/.scons_cache/
+      #     key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+      #     restore-keys: |
+      #       ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+      #       ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
+      #       ${{env.BIN}}-${{inputs.godot-ref}}
 
       - name: Compilation
         env:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index fa02103..dc68f03 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -227,6 +227,7 @@ jobs:
           sudo apt-get install libwayland-dev
 
       - name: Set up scons cache
+        if: inputs.test-build # ! Only cache test/PR builds
         uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a737c41..4a871cc 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -175,6 +175,7 @@ jobs:
           rm -f /tmp/vulkan-sdk.zip
 
       - name: Set up scons cache
+        if: inputs.test-build # ! Only cache test/PR builds
         uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index b5c434d..db8b75c 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -120,15 +120,16 @@ jobs:
           python --version
           scons --version
 
-      - name: Set up scons cache
-        uses: actions/cache@v4
-        with:
-          path: ${{github.workspace}}/.scons_cache/
-          key: ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-          restore-keys: |
-            ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-            ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
-            ${{env.CACHE_NAME}}-${{inputs.godot-ref}}
+      # ! Note: we stopped using the scons cache in release builds.
+      # - name: Set up scons cache
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: ${{github.workspace}}/.scons_cache/
+      #     key: ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+      #     restore-keys: |
+      #       ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+      #       ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
+      #       ${{env.CACHE_NAME}}-${{inputs.godot-ref}}
 
       - name: Compilation
         env:

From 7a3d5bc6a22bfce034f959cc63d8ce7994405c4f Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Sun, 1 Dec 2024 15:48:56 +0100
Subject: [PATCH 3/6] GHA: Compile Windows builds with statically linked ANGLE

---
 .github/workflows/windows.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index be67924..d8dcf60 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -221,6 +221,14 @@ jobs:
             ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
             ${{env.BIN}}-${{inputs.godot-ref}}
 
+      - name: Static ANGLE libs
+        run: |
+          mkdir -p deps/angle
+          cd deps/angle
+          url=https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static
+          curl -L -o windows_${{matrix.opts.arch}}.zip $url-${{matrix.opts.arch}}-${{matrix.opts.llvm && 'llvm' || 'gcc'}}-release.zip
+          unzip windows_${{matrix.opts.arch}}.zip
+
       - name: Pull build container
         run: |
           podman pull ghcr.io/limbonaut/godot-windows:${{env.BUILD_IMAGE_VERSION}}
@@ -236,6 +244,7 @@ jobs:
               module_mono_enabled=${{matrix.opts.dotnet}} \
               ${{env.SCONSFLAGS}} \
               ${{matrix.opts.scons-flags}} \
+              angle_libs=/build/deps/angle \
           "
           podman_run="podman run -it --rm \
             --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} \

From 62a142f188aea6660d7249f77cfcb9a17869fb56 Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Sun, 1 Dec 2024 16:24:40 +0100
Subject: [PATCH 4/6] GHA: Compile with D3D12 support and Mesa libs

---
 .github/workflows/windows.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index d8dcf60..0c402e4 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -33,8 +33,9 @@ on:
 # Global Settings
 env:
   BUILD_IMAGE_VERSION: 4.3-f40
+  MESA_VERSION: 23.1.9-1
   SCONS_CACHE_LIMIT: 4096
-  SCONSFLAGS: production=yes use_mingw=yes verbose=yes warnings=no progress=no
+  SCONSFLAGS: production=yes use_mingw=yes verbose=yes warnings=no progress=no d3d12=yes
 
 jobs:
   windows-builds:
@@ -228,6 +229,15 @@ jobs:
           url=https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static
           curl -L -o windows_${{matrix.opts.arch}}.zip $url-${{matrix.opts.arch}}-${{matrix.opts.llvm && 'llvm' || 'gcc'}}-release.zip
           unzip windows_${{matrix.opts.arch}}.zip
+          rm windows_${{matrix.opts.arch}}.zip
+
+      - name: Mesa libs
+        run: |
+          mkdir -p deps/mesa
+          cd deps/mesa
+          curl -L -o mesa_${{matrix.opts.arch}}.zip https://github.com/godotengine/godot-nir-static/releases/download/${{env.MESA_VERSION}}/godot-nir-static-${{matrix.opts.arch}}-${{matrix.opts.llvm && 'llvm' || 'gcc'}}-release.zip
+          unzip -o mesa_${{matrix.opts.arch}}.zip
+          rm -f mesa_${{matrix.opts.arch}}.zip
 
       - name: Pull build container
         run: |
@@ -245,6 +255,7 @@ jobs:
               ${{env.SCONSFLAGS}} \
               ${{matrix.opts.scons-flags}} \
               angle_libs=/build/deps/angle \
+              mesa_libs=/build/deps/mesa \
           "
           podman_run="podman run -it --rm \
             --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} \

From 11548c51f0b203b5fa5461d01235feec9e2d3c91 Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Sun, 1 Dec 2024 18:35:21 +0100
Subject: [PATCH 5/6] GHA: Fix build name missing in Windows builds

---
 .github/workflows/windows.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0c402e4..21e5181 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -208,7 +208,7 @@ jobs:
           path: modules/limboai
           ref: ${{ inputs.limboai-ref }}
 
-      # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
+      # Inits GODOT_VERSION, LIMBOAI_VERSION, NAME_PREFIX, GODOT_VERSION_STATUS, BUILD_NAME environment variables.
       - uses: ./modules/limboai/.github/actions/init-version
 
       - name: Set up scons cache
@@ -259,6 +259,7 @@ jobs:
           "
           podman_run="podman run -it --rm \
             --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} \
+            --env BUILD_NAME=${BUILD_NAME} \
             --env NUM_CORES=$(nproc --all) \
             --env SCONS_CACHE_LIMIT=${SCONS_CACHE_LIMIT} \
             --env DOTNET_NOLOGO=true \

From 8b0b15fce417320290a546b548b8b3b9f39045b5 Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Sun, 1 Dec 2024 18:41:54 +0100
Subject: [PATCH 6/6] GHA: Fix scons cache in test builds

---
 .github/workflows/windows.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 21e5181..fb76f6d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -261,10 +261,10 @@ jobs:
             --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} \
             --env BUILD_NAME=${BUILD_NAME} \
             --env NUM_CORES=$(nproc --all) \
-            --env SCONS_CACHE_LIMIT=${SCONS_CACHE_LIMIT} \
             --env DOTNET_NOLOGO=true \
             --env DOTNET_CLI_TELEMETRY_OPTOUT=true \
-            --env SCONS_CACHE=${{github.workspace}}/.scons_cache/
+            --env SCONS_CACHE=/build/.scons_cache/ \
+            --env SCONS_CACHE_LIMIT=${SCONS_CACHE_LIMIT} \
             -v ${GITHUB_WORKSPACE}/:/build/ \
             -w /build godot-windows:${{env.BUILD_IMAGE_VERSION}} bash -c \
           "