Skip to content

Commit eab52dc

Browse files
authored
Merge pull request #15 from davidmfinol/windows
Combine Windows builds
2 parents 691a498 + 2d5c387 commit eab52dc

File tree

1 file changed

+8
-36
lines changed

1 file changed

+8
-36
lines changed

.github/workflows/main.yml

+8-36
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
echo "is_unity_license_set=$is_unity_license_set" >> $GITHUB_OUTPUT
2626
2727
activation:
28-
needs: [checklicense]
28+
needs: checklicense
2929
if: needs.checklicense.outputs.is_unity_license_set == 'false'
3030
name: Request manual activation file 🔑
3131
runs-on: ubuntu-latest
@@ -42,7 +42,7 @@ jobs:
4242
path: ${{ steps.getManualLicenseFile.outputs.filePath }}
4343

4444
test:
45-
needs: [checklicense]
45+
needs: checklicense
4646
if: needs.checklicense.outputs.is_unity_license_set == 'true'
4747
name: Run all tests ✨
4848
runs-on: ubuntu-latest
@@ -68,7 +68,7 @@ jobs:
6868
path: ${{ steps.testRunner.outputs.artifactsPath }}
6969

7070
build:
71-
needs: [test]
71+
needs: test
7272
name: Build for ${{ matrix.targetPlatform }}
7373
runs-on: ubuntu-latest
7474
strategy:
@@ -99,8 +99,8 @@ jobs:
9999
name: Build-${{ matrix.targetPlatform }}
100100
path: build
101101

102-
buildWithMac:
103-
needs: [build]
102+
buildForMac:
103+
needs: build
104104
name: Build for ${{ matrix.targetPlatform }}
105105
runs-on: macos-latest
106106
strategy:
@@ -128,37 +128,8 @@ jobs:
128128
name: Build-${{ matrix.targetPlatform }}
129129
path: build
130130

131-
buildWithWindows:
132-
needs: build
133-
name: Build for ${{ matrix.targetPlatform }}
134-
runs-on: windows-2019
135-
strategy:
136-
fail-fast: false
137-
matrix:
138-
targetPlatform:
139-
- WSAPlayer
140-
steps:
141-
- uses: actions/checkout@v3
142-
with:
143-
lfs: true
144-
- uses: actions/cache@v3
145-
with:
146-
path: Library
147-
key: Library-${{ matrix.targetPlatform }}
148-
- uses: game-ci/unity-builder@v2
149-
env:
150-
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
151-
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
152-
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
153-
with:
154-
targetPlatform: ${{ matrix.targetPlatform }}
155-
- uses: actions/upload-artifact@v3
156-
with:
157-
name: Build-${{ matrix.targetPlatform }}
158-
path: build
159-
160-
buildWithWindows2:
161-
needs: buildWithWindows
131+
buildForWindows:
132+
needs: buildForMac
162133
name: Build for ${{ matrix.targetPlatform }}
163134
runs-on: windows-2019
164135
strategy:
@@ -167,6 +138,7 @@ jobs:
167138
targetPlatform:
168139
- StandaloneWindows
169140
- StandaloneWindows64
141+
- WSAPlayer
170142
steps:
171143
- uses: actions/checkout@v3
172144
with:

0 commit comments

Comments
 (0)