Reverted changes to workflow from tohami's flow since it did not work…

… for all windows builds.
blazium-engine · Jan 8, 2025 · 7c6f523 · 7c6f523
1 parent 9685741
commit 7c6f523
Showing 1 changed file with 21 additions and 35 deletions.
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -32,8 +32,7 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no progress=no angle_libs=${{ github.workspace }}/deps/angle
-  DXFLAGS: d3d12=yes mesa_libs=${{ github.workspace }}/deps/mesa
+  SCONSFLAGS: verbose=yes warnings=no progress=no #d3d12=yes "mesa_libs=${{github.workspace}}/deps/mesa" "angle_libs=${{github.workspace}}/deps/angle"
   SCONS_CACHE_MSVC_CONFIG: true
   DEPLOY_TYPE: windows
 
@@ -105,43 +104,39 @@ jobs:
           - name: Editor (64bit)
             cache-name: windows-editor-64bit
             target: editor
-            sconsflags: arch=x86_64 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
-            arm: false
 
           - name: Editor w/ Mono (64bit)
             cache-name: windows-editor-mono-64bit
             target: editor
-            sconsflags: module_mono_enabled=yes arch=x86_64 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
-            arm: false
 
           - name: Editor (32bit)
             cache-name: windows-editor-32bit
             target: editor
-            sconsflags: arch=x86_32 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
-            arm: false
 
           - name: Editor w/ Mono (32bit)
             cache-name: windows-editor-mono-32bit
             target: editor
-            sconsflags: module_mono_enabled=yes arch=x86_32 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
-            arm: false
 
           - name: Editor (arm64)
             cache-name: windows-editor-arm64
             target: editor
-            sconsflags: arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
             arm: true
             skip: false
 
           - name: Editor w/ Mono (arm64)
             cache-name: windows-editor-mono-arm64
             target: editor
-            sconsflags: module_mono_enabled=yes arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
             arm: true
             skip: false
@@ -444,84 +439,76 @@ jobs:
           - name: Template w/ Mono (64bit)
             cache-name: windows-template-mono-64bit
             target: template_release
-            sconsflags: module_mono_enabled=yes arch=x86_64 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
-            arm: false
 
           - name: Template (64bit)
             cache-name: windows-template-64bit
             target: template_release
-            sconsflags: arch=x86_64 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
-            arm: false
 
           - name: Template w/ Mono (64bit)
             cache-name: windows-debug-template-mono-64bit
             target: template_debug
-            sconsflags: module_mono_enabled=yes arch=x86_64 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=x86_64  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
-            arm: false
 
           - name: Template (64bit)
             cache-name: windows-debug-template-64bit
             target: template_debug
-            sconsflags: arch=x86_64 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=x86_64 ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
-            arm: false
 
           - name: Template w/ Mono (32bit)
             cache-name: windows-template-mono-32bit
             target: template_release
-            sconsflags: module_mono_enabled=yes arch=x86_32 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
-            arm: false
 
           - name: Template (32bit)
             cache-name: windows-template-32bit
             target: template_release
-            sconsflags: arch=x86_32 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
-            arm: false
 
           - name: Template w/ Mono (32bit)
             cache-name: windows-debug-template-mono-32bit
             target: template_debug
-            sconsflags: module_mono_enabled=yes arch=x86_32 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=x86_32  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
-            arm: false
 
           - name: Template (32bit)
             cache-name: windows-debug-template-32bit
             target: template_debug
-            sconsflags: arch=x86_32 ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=x86_32 ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
-            arm: false
 
           - name: Template w/ Mono (arm64)
             cache-name: windows-template-mono-arm64
             target: template_release
-            sconsflags: module_mono_enabled=yes arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
             arm: true
 
           - name: Template (arm64)
             cache-name: windows-template-arm64
             target: template_release
-            sconsflags: arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=arm64 use_llvm=yes  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
             arm: true
 
           - name: Template w/ Mono (arm64)
             cache-name: windows-debug-template-mono-arm64
             target: template_debug
-            sconsflags: module_mono_enabled=yes arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: module_mono_enabled=yes arch=arm64 use_llvm=yes  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
             arm: true
 
           - name: Template (arm64)
             cache-name: windows-debug-template-arm64
             target: template_debug
-            sconsflags: arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }} ${{ github.env.DXFLAGS }}
+            sconsflags: arch=arm64 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
             arm: true
 
@@ -535,14 +522,14 @@ jobs:
           - name: Template (arm32)
             cache-name: windows-template-arm32
             target: template_release
-            sconsflags: arch=arm32 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }}
+            sconsflags: arch=arm32 use_llvm=yes  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: false
             arm: true
 
           - name: Template w/ Mono (arm32)
             cache-name: windows-debug-template-mono-arm32
             target: template_debug
-            sconsflags: module_mono_enabled=yes arch=arm32 use_llvm=yes ${{ github.event.client_payload.production && 'production=yes' || '' }}
+            sconsflags: module_mono_enabled=yes arch=arm32 use_llvm=yes  ${{ github.event.client_payload.production && 'production=yes' || '' }}
             mono: true
             arm: true
 
@@ -850,4 +837,3 @@ jobs:
           source: build.sha
           out_dir: ${{ env.DEPLOY_TYPE }}/${{ github.event.client_payload.type || 'nightly' }}
 
-