From 2d5c38780fa511621da189b0ec246b5a85fe6e2d Mon Sep 17 00:00:00 2001
From: David Finol <davidmfinol@gmail.com>
Date: Sat, 22 Apr 2023 09:45:32 -0500
Subject: [PATCH] Combine Windows builds

---
 .github/workflows/main.yml | 46 ++++++++------------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7d7111f..bf764fd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
             echo "is_unity_license_set=$is_unity_license_set" >> $GITHUB_OUTPUT
 
   activation:
-    needs: [checklicense]
+    needs: checklicense
     if: needs.checklicense.outputs.is_unity_license_set == 'false'
     name: Request manual activation file 🔑
     runs-on: ubuntu-latest
@@ -42,7 +42,7 @@ jobs:
           path: ${{ steps.getManualLicenseFile.outputs.filePath }}
 
   test:
-    needs: [checklicense]
+    needs: checklicense
     if: needs.checklicense.outputs.is_unity_license_set == 'true'
     name: Run all tests ✨
     runs-on: ubuntu-latest
@@ -68,7 +68,7 @@ jobs:
           path: ${{ steps.testRunner.outputs.artifactsPath }}
 
   build:
-    needs: [test]
+    needs: test
     name: Build for ${{ matrix.targetPlatform }}
     runs-on: ubuntu-latest
     strategy:
@@ -99,8 +99,8 @@ jobs:
           name: Build-${{ matrix.targetPlatform }}
           path: build
 
-  buildWithMac:
-    needs: [build]
+  buildForMac:
+    needs: build
     name: Build for ${{ matrix.targetPlatform }}
     runs-on: macos-latest
     strategy:
@@ -128,14 +128,16 @@ jobs:
           name: Build-${{ matrix.targetPlatform }}
           path: build
 
-  buildWithWindows:
-    needs: build
+  buildForWindows:
+    needs: buildForMac
     name: Build for ${{ matrix.targetPlatform }}
     runs-on: windows-2019
     strategy:
       fail-fast: false
       matrix:
         targetPlatform:
+          - StandaloneWindows
+          - StandaloneWindows64
           - WSAPlayer
     steps:
       - uses: actions/checkout@v3
@@ -156,33 +158,3 @@ jobs:
         with:
           name: Build-${{ matrix.targetPlatform }}
           path: build
-
-  buildWithWindows2:
-    needs: buildWithWindows
-    name: Build for ${{ matrix.targetPlatform }}
-    runs-on: windows-2019
-    strategy:
-      fail-fast: false
-      matrix:
-        targetPlatform:
-          - StandaloneWindows
-          - StandaloneWindows64
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          lfs: true
-      - uses: actions/cache@v3
-        with:
-          path: Library
-          key: Library-${{ matrix.targetPlatform }}
-      - uses: game-ci/unity-builder@v2
-        env:
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-        with:
-          targetPlatform: ${{ matrix.targetPlatform }}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: Build-${{ matrix.targetPlatform }}
-          path: build