Skip to content

Commit 9ab6fc0

Browse files
davidmfinoldavidmfinol
authored
Merge pull request #11 from davidmfinol/v2021
Add macOS and Windows builds and update versions
2 parents 97cf500 + b16a5de commit 9ab6fc0

File tree

8 files changed

+431
-81
lines changed

8 files changed

+431
-81
lines changed

‎.github/workflows/main.yml

+80-16
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ name: Unity Actions
22

33
on:
44
pull_request: {}
5-
push: { branches: [main, master, develop] }
5+
push: {}
66

77
env:
88
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
9+
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
10+
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
911
PROJECT_PATH: .
1012

1113
jobs:
@@ -30,10 +32,10 @@ jobs:
3032
- name: Request manual activation file
3133
id: getManualLicenseFile
3234
# https://github.com/game-ci/unity-request-activation-file/releases/
33-
uses: game-ci/unity-request-activation-file@v2.0-alpha-1
35+
uses: game-ci/unity-request-activation-file@v2
3436
# Upload artifact (Unity_v20XX.X.XXXX.alf)
3537
- name: Expose as artifact
36-
uses: actions/upload-artifact@v1
38+
uses: actions/upload-artifact@v3
3739
with:
3840
name: ${{ steps.getManualLicenseFile.outputs.filePath }}
3941
path: ${{ steps.getManualLicenseFile.outputs.filePath }}
@@ -44,24 +46,24 @@ jobs:
4446
name: Test all modes ✨
4547
runs-on: ubuntu-latest
4648
steps:
47-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v3
4850
with:
4951
lfs: true
50-
- uses: actions/cache@v2.1.3
52+
- uses: actions/cache@v3
5153
with:
5254
path: Library
5355
key: Library-test-project-${{ matrix.targetPlatform }}
5456
restore-keys: |
5557
Library-test-project-
5658
Library-
5759
# https://github.com/game-ci/unity-test-runner/releases/
58-
- uses: game-ci/unity-test-runner@v2.0-alpha-2
60+
- uses: game-ci/unity-test-runner@v2
5961
id: testRunner
6062
with:
6163
projectPath: ${{ env.PROJECT_PATH }}
6264
testMode: all
6365
customParameters: "-nographics"
64-
- uses: actions/upload-artifact@v2
66+
- uses: actions/upload-artifact@v3
6567
with:
6668
name: Test results (all modes)
6769
path: ${{ steps.testRunner.outputs.artifactsPath }}
@@ -75,31 +77,93 @@ jobs:
7577
fail-fast: false
7678
matrix:
7779
targetPlatform:
78-
- StandaloneOSX
79-
- StandaloneWindows
80-
- StandaloneWindows64
8180
- StandaloneLinux64
8281
- iOS
8382
- Android
84-
# See https://github.com/game-ci/docker/issues/53 webgl will be supported in editor image v0.9
85-
# - WebGL
83+
- WebGL
8684
steps:
87-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v3
8886
with:
8987
lfs: true
90-
- uses: actions/cache@v2.1.3
88+
- uses: actions/cache@v3
9189
with:
9290
path: ${{ matrix.projectPath }}/Library
9391
key: Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}
9492
restore-keys: |
9593
Library-${{ matrix.projectPath }}-
9694
Library-
9795
# https://github.com/game-ci/unity-builder/releases/
98-
- uses: game-ci/[email protected]
96+
- uses: game-ci/unity-builder@v2
97+
with:
98+
projectPath: ${{ env.PROJECT_PATH }}
99+
targetPlatform: ${{ matrix.targetPlatform }}
100+
- uses: actions/upload-artifact@v3
101+
with:
102+
name: Build-${{ matrix.targetPlatform }}
103+
path: build
104+
105+
buildWithMac:
106+
needs: [checklicense]
107+
if: needs.checklicense.outputs.is_unity_license_set == 'true'
108+
name: Build for ${{ matrix.targetPlatform }}
109+
runs-on: macos-latest
110+
strategy:
111+
fail-fast: false
112+
matrix:
113+
targetPlatform:
114+
- StandaloneOSX
115+
steps:
116+
- name: Checkout Repository
117+
uses: actions/checkout@v3
118+
with:
119+
lfs: true
120+
- uses: actions/cache@v3
121+
with:
122+
path: ${{ matrix.projectPath }}/Library
123+
key: Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}
124+
restore-keys: |
125+
Library-${{ matrix.projectPath }}-
126+
Library-
127+
- uses: game-ci/unity-builder@v2
128+
with:
129+
projectPath: ${{ env.PROJECT_PATH }}
130+
targetPlatform: ${{ matrix.targetPlatform }}
131+
- name: Upload Build
132+
uses: actions/upload-artifact@v3
133+
with:
134+
name: Build-${{ matrix.targetPlatform }}
135+
path: build
136+
137+
buildWithWindows:
138+
needs: [build, buildWithMac]
139+
if: needs.checklicense.outputs.is_unity_license_set == 'true'
140+
name: Build for ${{ matrix.targetPlatform }}
141+
runs-on: windows-2019
142+
strategy:
143+
fail-fast: false
144+
matrix:
145+
targetPlatform:
146+
- StandaloneWindows
147+
- StandaloneWindows64
148+
- WSAPlayer
149+
steps:
150+
- name: Checkout Repository
151+
uses: actions/checkout@v3
152+
with:
153+
lfs: true
154+
- uses: actions/cache@v3
155+
with:
156+
path: ${{ matrix.projectPath }}/Library
157+
key: Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}
158+
restore-keys: |
159+
Library-${{ matrix.projectPath }}-
160+
Library-
161+
- uses: game-ci/unity-builder@v2
99162
with:
100163
projectPath: ${{ env.PROJECT_PATH }}
101164
targetPlatform: ${{ matrix.targetPlatform }}
102-
- uses: actions/upload-artifact@v2
165+
- name: Upload Build
166+
uses: actions/upload-artifact@v3
103167
with:
104168
name: Build-${{ matrix.targetPlatform }}
105169
path: build

‎Packages/manifest.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "1.3.9",
4-
"com.unity.ide.rider": "1.2.1",
5-
"com.unity.ide.visualstudio": "2.0.2",
6-
"com.unity.ide.vscode": "1.2.1",
7-
"com.unity.test-framework": "1.1.16",
8-
"com.unity.textmeshpro": "3.0.1",
9-
"com.unity.timeline": "1.3.6",
3+
"com.unity.collab-proxy": "1.15.16",
4+
"com.unity.ide.rider": "3.0.13",
5+
"com.unity.ide.visualstudio": "2.0.14",
6+
"com.unity.ide.vscode": "1.2.5",
7+
"com.unity.test-framework": "1.1.31",
8+
"com.unity.textmeshpro": "3.0.6",
9+
"com.unity.timeline": "1.6.4",
1010
"com.unity.ugui": "1.0.0",
1111
"com.unity.modules.ai": "1.0.0",
1212
"com.unity.modules.androidjni": "1.0.0",

‎Packages/packages-lock.json

+40-13
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,77 @@
11
{
22
"dependencies": {
33
"com.unity.collab-proxy": {
4-
"version": "1.3.9",
4+
"version": "1.15.16",
55
"depth": 0,
66
"source": "registry",
7-
"dependencies": {},
7+
"dependencies": {
8+
"com.unity.services.core": "1.0.1"
9+
},
810
"url": "https://packages.unity.com"
911
},
1012
"com.unity.ext.nunit": {
11-
"version": "1.0.0",
13+
"version": "1.0.6",
1214
"depth": 1,
1315
"source": "registry",
1416
"dependencies": {},
1517
"url": "https://packages.unity.com"
1618
},
1719
"com.unity.ide.rider": {
18-
"version": "1.2.1",
20+
"version": "3.0.13",
1921
"depth": 0,
2022
"source": "registry",
2123
"dependencies": {
22-
"com.unity.test-framework": "1.1.1"
24+
"com.unity.ext.nunit": "1.0.6"
2325
},
2426
"url": "https://packages.unity.com"
2527
},
2628
"com.unity.ide.visualstudio": {
27-
"version": "2.0.2",
29+
"version": "2.0.14",
2830
"depth": 0,
2931
"source": "registry",
30-
"dependencies": {},
32+
"dependencies": {
33+
"com.unity.test-framework": "1.1.9"
34+
},
3135
"url": "https://packages.unity.com"
3236
},
3337
"com.unity.ide.vscode": {
34-
"version": "1.2.1",
38+
"version": "1.2.5",
3539
"depth": 0,
3640
"source": "registry",
3741
"dependencies": {},
3842
"url": "https://packages.unity.com"
3943
},
44+
"com.unity.nuget.newtonsoft-json": {
45+
"version": "3.0.2",
46+
"depth": 2,
47+
"source": "registry",
48+
"dependencies": {},
49+
"url": "https://packages.unity.com"
50+
},
51+
"com.unity.services.core": {
52+
"version": "1.3.1",
53+
"depth": 1,
54+
"source": "registry",
55+
"dependencies": {
56+
"com.unity.modules.unitywebrequest": "1.0.0",
57+
"com.unity.nuget.newtonsoft-json": "3.0.2",
58+
"com.unity.modules.androidjni": "1.0.0"
59+
},
60+
"url": "https://packages.unity.com"
61+
},
4062
"com.unity.test-framework": {
41-
"version": "1.1.16",
63+
"version": "1.1.31",
4264
"depth": 0,
4365
"source": "registry",
4466
"dependencies": {
45-
"com.unity.ext.nunit": "1.0.0",
67+
"com.unity.ext.nunit": "1.0.6",
4668
"com.unity.modules.imgui": "1.0.0",
4769
"com.unity.modules.jsonserialize": "1.0.0"
4870
},
4971
"url": "https://packages.unity.com"
5072
},
5173
"com.unity.textmeshpro": {
52-
"version": "3.0.1",
74+
"version": "3.0.6",
5375
"depth": 0,
5476
"source": "registry",
5577
"dependencies": {
@@ -58,10 +80,15 @@
5880
"url": "https://packages.unity.com"
5981
},
6082
"com.unity.timeline": {
61-
"version": "1.3.6",
83+
"version": "1.6.4",
6284
"depth": 0,
6385
"source": "registry",
64-
"dependencies": {},
86+
"dependencies": {
87+
"com.unity.modules.director": "1.0.0",
88+
"com.unity.modules.animation": "1.0.0",
89+
"com.unity.modules.audio": "1.0.0",
90+
"com.unity.modules.particlesystem": "1.0.0"
91+
},
6592
"url": "https://packages.unity.com"
6693
},
6794
"com.unity.ugui": {

‎ProjectSettings/MemorySettings.asset

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}

0 commit comments

Comments
 (0)