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
game-ci · Dec 13, 2023 · ce07478 · ce07478
1 parent c80d909
commit ce07478
Show file tree

Hide file tree

Showing 56 changed files with 3,043 additions and 598 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -2,10 +2,27 @@
 
 - ...
 
+#### Related Issues
+
+- ...
+
+#### Related PRs
+
+- ...
+
+#### Successful Workflow Run Link
+
+PRs don't have access to secrets so you will need to provide a link to a successful run
+of the workflows from your own repo.
+
+- ...
+
 #### Checklist
 
 <!-- please check all items and add your own -->
 
 - [x] Read the contribution [guide](../CONTRIBUTING.md) and accept the [code](../CODE_OF_CONDUCT.md) of conduct
+- [ ] Docs (If new inputs or outputs have been added or changes to behavior that should be documented. Please make a PR
+      in the [documentation repo](https://github.com/game-ci/documentation))
 - [ ] Readme (updated or not needed)
 - [ ] Tests (added, updated or not needed)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,12 +1,15 @@
 name: Actions 😎
 on:
-  push: { branches: [main] }
-  pull_request:
-    paths-ignore:
-      - '.github/**'
+  push:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
-  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>"
+  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+  UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+  UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
 
 jobs:
   tests:
@@ -32,7 +35,9 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
         testMode:
           - playmode
           - editmode
@@ -78,7 +83,9 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
     steps:
       ###########################
       #         Checkout        #
@@ -132,7 +139,9 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
         projectPath:
           - unity-project-with-correct-tests
     steps:
@@ -189,7 +198,9 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
     steps:
       ###########################
       #         Checkout        #
@@ -244,7 +255,9 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
     steps:
       ###########################
       #         Checkout        #
@@ -291,7 +304,9 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2022.3.7f1 # Only 2019.4+ docker images contain the IL2CPP backend installed.
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
     steps:
       ###########################
       #         Checkout        #
@@ -343,7 +358,9 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
         projectPath:
           - unity-project-with-correct-tests
     steps:
@@ -409,7 +426,9 @@ jobs:
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
         testMode:
           - playmode
           - editmode
@@ -448,7 +467,9 @@ jobs:
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
     steps:
       ###########################
       #         Checkout        #
@@ -492,7 +513,9 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
     steps:
@@ -540,7 +563,9 @@ jobs:
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
     steps:
       ###########################
       #         Checkout        #
@@ -584,7 +609,9 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion:
-          - 2022.3.7f1
+          - 2022.3.13f1
+          - 2023.1.19f1
+          - 2023.2.2f1
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
     steps:

diff --git a/action.yml b/action.yml
@@ -82,6 +82,20 @@ inputs:
     required: false
     default: ''
     description: 'Url to a unity license server for acquiring floating licenses.'
+  containerRegistryRepository:
+    required: false
+    default: 'unityci/editor'
+    description: 'Container registry and repository to pull image from. Only applicable if customImage is not set.'
+  containerRegistryImageVersion:
+    required: false
+    default: '3'
+    description: 'Container registry image version. Only applicable if customImage is not set.'
+  runAsHostUser:
+    required: false
+    default: 'false'
+    description:
+      'Whether to run as a user that matches the host system or the default root container user. Only applicable to
+      Linux hosts and containers. This is useful for fixing permission errors on Self-Hosted runners.'
 outputs:
   artifactsPath:
     description: 'Path where the artifacts are stored.'
@@ -91,6 +105,6 @@ branding:
   icon: 'box'
   color: 'gray-dark'
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'dist/main.js'
   post: 'dist/post.js'
diff --git a/dist/BlankProject/.gitignore b/dist/BlankProject/.gitignore
@@ -0,0 +1,49 @@
+Library/
+[Tt]emp/
+[Oo]bj/
+[Bb]uild/
+[Bb]uilds/
+[Ll]ogs/
+
+# Uncomment this line if you wish to ignore the asset store tools plugin
+# [Aa]ssets/AssetStoreTools*
+
+# IDEs
+.vs/
+.idea/
+
+# Gradle cache directory
+.gradle/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+*.mdb
+*.opendb
+*.VC.db
+
+# Unity3D generated meta files
+*.pidb.meta
+*.pdb.meta
+*.mdb.meta
+
+# Unity3D generated file on crash reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.unitypackage
+
+# Crashlytics generated file
+crashlytics-build.properties
diff --git a/dist/BlankProject/Assets/Scenes.meta b/dist/BlankProject/Assets/Scenes.meta