From 5f688e0037c7b71c67efaacb2fb77c26b54b13c7 Mon Sep 17 00:00:00 2001
From: Arnav Mehta <77837038+ArnavMehta3000@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:30:52 +0100
Subject: [PATCH 1/4] Update windows.yml

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

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 65eff4b..3fd2d96 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,7 +3,6 @@ name: Windows
 
 on:
     push:
-        branches: [ "main" ]
     pull_request:
         branches: [ "main" ]
 
@@ -16,7 +15,12 @@ jobs:
 
             matrix:
                 build-config: [ debug, release ]
-                rhi: [ dx11, dx12, opengl, vulkan ]
+                rhi: [ dx11, opengl  ] # We currently do not support the other API's
+                # rhi: [ dx11, dx12, opengl, vulkan ]
+        
+        concurrency:
+            group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.os }}-${{ matrix.arch }}-Windows
+            cancel-in-progress: true
 
         steps:
             - uses: actions/checkout@v4

From 192f9040b0516882d994544d63835d8246ef959b Mon Sep 17 00:00:00 2001
From: Arnav Mehta <77837038+ArnavMehta3000@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:33:13 +0100
Subject: [PATCH 2/4] Remove local package installation policy (#31)

---
 xmake.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/xmake.lua b/xmake.lua
index d1870d8..0b0fed2 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,4 +1,4 @@
-set_xmakever("2.9.2")
+set_xmakever("2.9.4")
 add_rules("mode.debug", "mode.release")
 set_allowedmodes("debug", "release")
 set_allowedplats("windows", "linux", "macosx")
@@ -19,8 +19,6 @@ set_warnings("all", "extra")
 
 -- Enable link time optimization
 set_policy("build.optimization.lto", true)
--- Install packages locally instead of system cache
-set_policy("package.install_locally", true)
 -- Allow auto build before running
 set_policy("run.autobuild", true)
 

From 08855c466168b31d354d1946207f64998931d50a Mon Sep 17 00:00:00 2001
From: Arnav Mehta <77837038+ArnavMehta3000@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:39:20 +0100
Subject: [PATCH 3/4] Test build win32-dx11 action

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

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3fd2d96..453fa82 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -2,7 +2,6 @@
 name: Windows
 
 on:
-    push:
     pull_request:
         branches: [ "main" ]
 
@@ -15,7 +14,7 @@ jobs:
 
             matrix:
                 build-config: [ debug, release ]
-                rhi: [ dx11, opengl  ] # We currently do not support the other API's
+                rhi: [ dx11 ] # We currently do not support the other API's
                 # rhi: [ dx11, dx12, opengl, vulkan ]
         
         concurrency:
@@ -27,11 +26,12 @@ jobs:
             - uses: xmake-io/github-action-setup-xmake@v1
               with:
                   xmake-version: latest
+                  actions-cache-folder: '.xmake-cache'
                   
             - name: Set RHI and build config
               run: |
-                  xmake f --file=${GITHUB_WORKSPACE}/xmake.lua --rhi=${{ matrix.rhi }} -m ${{ matrix.build-config }} -y
+                  xmake f --file=${GITHUB_WORKSPACE}/xmake.lua --rhi=${{ matrix.rhi }} -m ${{ matrix.build-config }} -y -vD
                   
             - name: Run xmake tests
               run: |
-                  xmake test test */compile_pass --file=${GITHUB_WORKSPACE}/xmake.lua -y
+                  xmake test test */compile_pass --file=${GITHUB_WORKSPACE}/xmake.lua -y -vD

From 8b606a717b5e04867e66163cae7ee0421b788649 Mon Sep 17 00:00:00 2001
From: Arnav Mehta <77837038+ArnavMehta3000@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:44:34 +0100
Subject: [PATCH 4/4] Update windows.yml

Remove extra test flag
---
 .github/workflows/windows.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 453fa82..a57cfd2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -17,10 +17,6 @@ jobs:
                 rhi: [ dx11 ] # We currently do not support the other API's
                 # rhi: [ dx11, dx12, opengl, vulkan ]
         
-        concurrency:
-            group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.os }}-${{ matrix.arch }}-Windows
-            cancel-in-progress: true
-
         steps:
             - uses: actions/checkout@v4
             - uses: xmake-io/github-action-setup-xmake@v1
@@ -34,4 +30,4 @@ jobs:
                   
             - name: Run xmake tests
               run: |
-                  xmake test test */compile_pass --file=${GITHUB_WORKSPACE}/xmake.lua -y -vD
+                  xmake test */compile_pass --file=${GITHUB_WORKSPACE}/xmake.lua -y -vD