Skip to content

Commit ce07478

Browse files
authored
Unity builder v4 Parity Update (#246)
- Updated activation strategy to align with builder strategy for more stable activation with retry logic - Added `containerRegistryImageVersion` and `containerRegistryRepository` for improved custom image support - Added `runAsHostUser` to fix self-hosted runner issues - Scripts folder cleanup - Added error/warning annotations for activation issues - Improved serial masking - Image environment factory addition and docker refactoring
1 parent c80d909 commit ce07478

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3043
-598
lines changed

.github/pull_request_template.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,27 @@
22

33
- ...
44

5+
#### Related Issues
6+
7+
- ...
8+
9+
#### Related PRs
10+
11+
- ...
12+
13+
#### Successful Workflow Run Link
14+
15+
PRs don't have access to secrets so you will need to provide a link to a successful run
16+
of the workflows from your own repo.
17+
18+
- ...
19+
520
#### Checklist
621

722
<!-- please check all items and add your own -->
823

924
- [x] Read the contribution [guide](../CONTRIBUTING.md) and accept the [code](../CODE_OF_CONDUCT.md) of conduct
25+
- [ ] Docs (If new inputs or outputs have been added or changes to behavior that should be documented. Please make a PR
26+
in the [documentation repo](https://github.com/game-ci/documentation))
1027
- [ ] Readme (updated or not needed)
1128
- [ ] Tests (added, updated or not needed)

.github/workflows/main.yml

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
name: Actions 😎
22
on:
3-
push: { branches: [main] }
4-
pull_request:
5-
paths-ignore:
6-
- '.github/**'
3+
push:
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
7+
cancel-in-progress: true
78

89
env:
9-
UNITY_LICENSE: "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root>\n <License id=\"Terms\">\n <MachineBindings>\n <Binding Key=\"1\" Value=\"576562626572264761624c65526f7578\"/>\n <Binding Key=\"2\" Value=\"576562626572264761624c65526f7578\"/>\n </MachineBindings>\n <MachineID Value=\"D7nTUnjNAmtsUMcnoyrqkgIbYdM=\"/>\n <SerialHash Value=\"2033b8ac3e6faa3742ca9f0bfae44d18f2a96b80\"/>\n <Features>\n <Feature Value=\"33\"/>\n <Feature Value=\"1\"/>\n <Feature Value=\"12\"/>\n <Feature Value=\"2\"/>\n <Feature Value=\"24\"/>\n <Feature Value=\"3\"/>\n <Feature Value=\"36\"/>\n <Feature Value=\"17\"/>\n <Feature Value=\"19\"/>\n <Feature Value=\"62\"/>\n </Features>\n <DeveloperData Value=\"AQAAAEY0LUJHUlgtWEQ0RS1aQ1dWLUM1SlctR0RIQg==\"/>\n <SerialMasked Value=\"F4-BGRX-XD4E-ZCWV-C5JW-XXXX\"/>\n <StartDate Value=\"2021-02-08T00:00:00\"/>\n <UpdateDate Value=\"2021-02-09T00:34:57\"/>\n <InitialActivationDate Value=\"2021-02-08T00:34:56\"/>\n <LicenseVersion Value=\"6.x\"/>\n <ClientProvidedVersion Value=\"2018.4.30f1\"/>\n <AlwaysOnline Value=\"false\"/>\n <Entitlements>\n <Entitlement Ns=\"unity_editor\" Tag=\"UnityPersonal\" Type=\"EDITOR\" ValidTo=\"9999-12-31T00:00:00\"/>\n <Entitlement Ns=\"unity_editor\" Tag=\"DarkSkin\" Type=\"EDITOR_FEATURE\" ValidTo=\"9999-12-31T00:00:00\"/>\n </Entitlements>\n </License>\n<Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><SignedInfo><CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments\"/><SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/><Reference URI=\"#Terms\"><Transforms><Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/></Transforms><DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><DigestValue>m0Db8UK+ktnOLJBtHybkfetpcKo=</DigestValue></Reference></SignedInfo><SignatureValue>o/pUbSQAukz7+ZYAWhnA0AJbIlyyCPL7bKVEM2lVqbrXt7cyey+umkCXamuOgsWPVUKBMkXtMH8L\n5etLmD0getWIhTGhzOnDCk+gtIPfL4jMo9tkEuOCROQAXCci23VFscKcrkB+3X6h4wEOtA2APhOY\nB+wvC794o8/82ffjP79aVAi57rp3Wmzx+9pe9yMwoJuljAy2sc2tIMgdQGWVmOGBpQm3JqsidyzI\nJWG2kjnc7pDXK9pwYzXoKiqUqqrut90d+kQqRyv7MSZXR50HFqD/LI69h68b7P8Bjo3bPXOhNXGR\n9YCoemH6EkfCJxp2gIjzjWW+l2Hj2EsFQi8YXw==</SignatureValue></Signature></root>"
10+
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
11+
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
12+
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
1013

1114
jobs:
1215
tests:
@@ -32,7 +35,9 @@ jobs:
3235
projectPath:
3336
- unity-project-with-correct-tests
3437
unityVersion:
35-
- 2022.3.7f1
38+
- 2022.3.13f1
39+
- 2023.1.19f1
40+
- 2023.2.2f1
3641
testMode:
3742
- playmode
3843
- editmode
@@ -78,7 +83,9 @@ jobs:
7883
projectPath:
7984
- unity-project-with-correct-tests
8085
unityVersion:
81-
- 2022.3.7f1
86+
- 2022.3.13f1
87+
- 2023.1.19f1
88+
- 2023.2.2f1
8289
steps:
8390
###########################
8491
# Checkout #
@@ -132,7 +139,9 @@ jobs:
132139
fail-fast: false
133140
matrix:
134141
unityVersion:
135-
- 2022.3.7f1
142+
- 2022.3.13f1
143+
- 2023.1.19f1
144+
- 2023.2.2f1
136145
projectPath:
137146
- unity-project-with-correct-tests
138147
steps:
@@ -189,7 +198,9 @@ jobs:
189198
projectPath:
190199
- unity-project-with-correct-tests
191200
unityVersion:
192-
- 2022.3.7f1
201+
- 2022.3.13f1
202+
- 2023.1.19f1
203+
- 2023.2.2f1
193204
steps:
194205
###########################
195206
# Checkout #
@@ -244,7 +255,9 @@ jobs:
244255
projectPath:
245256
- unity-project-with-correct-tests
246257
unityVersion:
247-
- 2022.3.7f1
258+
- 2022.3.13f1
259+
- 2023.1.19f1
260+
- 2023.2.2f1
248261
steps:
249262
###########################
250263
# Checkout #
@@ -291,7 +304,9 @@ jobs:
291304
projectPath:
292305
- unity-project-with-correct-tests
293306
unityVersion:
294-
- 2022.3.7f1 # Only 2019.4+ docker images contain the IL2CPP backend installed.
307+
- 2022.3.13f1
308+
- 2023.1.19f1
309+
- 2023.2.2f1
295310
steps:
296311
###########################
297312
# Checkout #
@@ -343,7 +358,9 @@ jobs:
343358
fail-fast: false
344359
matrix:
345360
unityVersion:
346-
- 2022.3.7f1
361+
- 2022.3.13f1
362+
- 2023.1.19f1
363+
- 2023.2.2f1
347364
projectPath:
348365
- unity-project-with-correct-tests
349366
steps:
@@ -409,7 +426,9 @@ jobs:
409426
projectPath:
410427
- unity-package-with-correct-tests/com.example.testpackage
411428
unityVersion:
412-
- 2022.3.7f1
429+
- 2022.3.13f1
430+
- 2023.1.19f1
431+
- 2023.2.2f1
413432
testMode:
414433
- playmode
415434
- editmode
@@ -448,7 +467,9 @@ jobs:
448467
projectPath:
449468
- unity-package-with-correct-tests/com.example.testpackage
450469
unityVersion:
451-
- 2022.3.7f1
470+
- 2022.3.13f1
471+
- 2023.1.19f1
472+
- 2023.2.2f1
452473
steps:
453474
###########################
454475
# Checkout #
@@ -492,7 +513,9 @@ jobs:
492513
fail-fast: false
493514
matrix:
494515
unityVersion:
495-
- 2022.3.7f1
516+
- 2022.3.13f1
517+
- 2023.1.19f1
518+
- 2023.2.2f1
496519
projectPath:
497520
- unity-package-with-correct-tests/com.example.testpackage
498521
steps:
@@ -540,7 +563,9 @@ jobs:
540563
projectPath:
541564
- unity-package-with-correct-tests/com.example.testpackage
542565
unityVersion:
543-
- 2022.3.7f1
566+
- 2022.3.13f1
567+
- 2023.1.19f1
568+
- 2023.2.2f1
544569
steps:
545570
###########################
546571
# Checkout #
@@ -584,7 +609,9 @@ jobs:
584609
fail-fast: false
585610
matrix:
586611
unityVersion:
587-
- 2022.3.7f1
612+
- 2022.3.13f1
613+
- 2023.1.19f1
614+
- 2023.2.2f1
588615
projectPath:
589616
- unity-package-with-correct-tests/com.example.testpackage
590617
steps:

action.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,20 @@ inputs:
8282
required: false
8383
default: ''
8484
description: 'Url to a unity license server for acquiring floating licenses.'
85+
containerRegistryRepository:
86+
required: false
87+
default: 'unityci/editor'
88+
description: 'Container registry and repository to pull image from. Only applicable if customImage is not set.'
89+
containerRegistryImageVersion:
90+
required: false
91+
default: '3'
92+
description: 'Container registry image version. Only applicable if customImage is not set.'
93+
runAsHostUser:
94+
required: false
95+
default: 'false'
96+
description:
97+
'Whether to run as a user that matches the host system or the default root container user. Only applicable to
98+
Linux hosts and containers. This is useful for fixing permission errors on Self-Hosted runners.'
8599
outputs:
86100
artifactsPath:
87101
description: 'Path where the artifacts are stored.'
@@ -91,6 +105,6 @@ branding:
91105
icon: 'box'
92106
color: 'gray-dark'
93107
runs:
94-
using: 'node16'
108+
using: 'node20'
95109
main: 'dist/main.js'
96110
post: 'dist/post.js'

dist/BlankProject/.gitignore

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
Library/
2+
[Tt]emp/
3+
[Oo]bj/
4+
[Bb]uild/
5+
[Bb]uilds/
6+
[Ll]ogs/
7+
8+
# Uncomment this line if you wish to ignore the asset store tools plugin
9+
# [Aa]ssets/AssetStoreTools*
10+
11+
# IDEs
12+
.vs/
13+
.idea/
14+
15+
# Gradle cache directory
16+
.gradle/
17+
18+
# Autogenerated VS/MD/Consulo solution and project files
19+
ExportedObj/
20+
.consulo/
21+
*.csproj
22+
*.unityproj
23+
*.sln
24+
*.suo
25+
*.tmp
26+
*.user
27+
*.userprefs
28+
*.pidb
29+
*.booproj
30+
*.svd
31+
*.pdb
32+
*.mdb
33+
*.opendb
34+
*.VC.db
35+
36+
# Unity3D generated meta files
37+
*.pidb.meta
38+
*.pdb.meta
39+
*.mdb.meta
40+
41+
# Unity3D generated file on crash reports
42+
sysinfo.txt
43+
44+
# Builds
45+
*.apk
46+
*.unitypackage
47+
48+
# Crashlytics generated file
49+
crashlytics-build.properties

dist/BlankProject/Assets/Scenes.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)