update unity versions (#236)

game-ci · Aug 21, 2023 · 6ed138a · 6ed138a
1 parent 7787abf
commit 6ed138a
Show file tree

Hide file tree

Showing 16 changed files with 550 additions and 43 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2019.4.40f1
+          - 2022.3.7f1
         testMode:
           - playmode
           - editmode
@@ -78,7 +78,7 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2019.4.40f1
+          - 2022.3.7f1
     steps:
       ###########################
       #         Checkout        #
@@ -132,7 +132,7 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion:
-          - 2019.4.40f1
+          - 2022.3.7f1
         projectPath:
           - unity-project-with-correct-tests
     steps:
@@ -189,7 +189,7 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2019.4.40f1
+          - 2022.3.7f1
     steps:
       ###########################
       #         Checkout        #
@@ -244,7 +244,7 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2019.4.40f1
+          - 2022.3.7f1
     steps:
       ###########################
       #         Checkout        #
@@ -291,7 +291,7 @@ jobs:
         projectPath:
           - unity-project-with-correct-tests
         unityVersion:
-          - 2019.4.40f1 # Only 2019.4+ docker images contain the IL2CPP backend installed.
+          - 2022.3.7f1 # Only 2019.4+ docker images contain the IL2CPP backend installed.
     steps:
       ###########################
       #         Checkout        #
@@ -343,7 +343,7 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion:
-          - 2019.4.40f1
+          - 2022.3.7f1
         projectPath:
           - unity-project-with-correct-tests
     steps:
@@ -409,7 +409,7 @@ jobs:
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
         unityVersion:
-          - 2019.2.11f1
+          - 2022.3.7f1
         testMode:
           - playmode
           - editmode
@@ -448,7 +448,7 @@ jobs:
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
         unityVersion:
-          - 2019.2.11f1
+          - 2022.3.7f1
     steps:
       ###########################
       #         Checkout        #
@@ -492,7 +492,7 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion:
-          - 2019.2.11f1
+          - 2022.3.7f1
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
     steps:
@@ -540,7 +540,7 @@ jobs:
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
         unityVersion:
-          - 2019.2.11f1
+          - 2022.3.7f1
     steps:
       ###########################
       #         Checkout        #
@@ -584,7 +584,7 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion:
-          - 2019.2.11f1
+          - 2022.3.7f1
         projectPath:
           - unity-package-with-correct-tests/com.example.testpackage
     steps:

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/model/docker.test.ts b/src/model/docker.test.ts
@@ -3,7 +3,7 @@ import Docker from './docker';
 
 describe('Docker', () => {
   it.skip('runs', async () => {
-    const image = 'unity-builder:2019.2.11f1-webgl';
+    const image = 'unity-builder:2022.3.7f1-webgl';
     const parameters = {
       workspace: Action.rootFolder,
       projectPath: `${Action.rootFolder}/test-project`,

diff --git a/src/model/image-tag.test.ts b/src/model/image-tag.test.ts
@@ -63,15 +63,15 @@ describe('ImageTag', () => {
     });
 
     it('returns the specific build platform', () => {
-      const image = new ImageTag({ editorVersion: '2019.2.11f1', targetPlatform: 'WebGL' });
+      const image = new ImageTag({ editorVersion: '2022.3.7f1', targetPlatform: 'WebGL' });
 
-      expect(image.toString()).toStrictEqual(`${defaults.image}:ubuntu-2019.2.11f1-webgl-1`);
+      expect(image.toString()).toStrictEqual(`${defaults.image}:ubuntu-2022.3.7f1-webgl-1`);
     });
 
     it('returns no specific build platform for generic targetPlatforms', () => {
       const image = new ImageTag({ targetPlatform: 'NoTarget' });
 
-      expect(image.toString()).toStrictEqual(`${defaults.image}:ubuntu-2019.2.11f1-1`);
+      expect(image.toString()).toStrictEqual(`${defaults.image}:ubuntu-2022.3.7f1-1`);
     });
   });
 });
diff --git a/src/model/image-tag.ts b/src/model/image-tag.ts
@@ -12,7 +12,7 @@ class ImageTag {
 
   constructor(imageProperties) {
     const {
-      editorVersion = '2019.2.11f1',
+      editorVersion = '2022.3.7f1',
       targetPlatform = ImageTag.getImagePlatformType(process.platform),
       customImage,
     } = imageProperties;

diff --git a/src/model/unity-version-parser.test.ts b/src/model/unity-version-parser.test.ts
@@ -7,9 +7,9 @@ describe('UnityVersionParser', () => {
     });
 
     it('parses from ProjectVersion.txt', () => {
-      const projectVersionContents = `m_EditorVersion: 2019.2.11f1
-      m_EditorVersionWithRevision: 2019.2.11f1 (5f859a4cfee5)`;
-      expect(UnityVersionParser.parse(projectVersionContents)).toBe('2019.2.11f1');
+      const projectVersionContents = `m_EditorVersion: 2022.3.7f1
+      m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0)`;
+      expect(UnityVersionParser.parse(projectVersionContents)).toBe('2022.3.7f1');
     });
   });
 
@@ -19,7 +19,7 @@ describe('UnityVersionParser', () => {
     });
 
     it('reads from unity-project-with-correct-tests', () => {
-      expect(UnityVersionParser.read('./unity-project-with-correct-tests')).toBe('2019.2.11f1');
+      expect(UnityVersionParser.read('./unity-project-with-correct-tests')).toBe('2022.3.7f1');
     });
   });
 });
diff --git a/unity-package-with-correct-tests/com.example.testpackage/package.json b/unity-package-with-correct-tests/com.example.testpackage/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.1",
   "displayName": "Test Package",
   "description": "Test Package",
-  "unity": "2019.2",
-  "unityRelease": "11f1",
+  "unity": "2022.3",
+  "unityRelease": "7f1",
   "keywords": [
     "nothing"
   ],

diff --git a/unity-project-with-correct-tests/.gitignore b/unity-project-with-correct-tests/.gitignore
@@ -1,12 +1,23 @@
-[Ll]ibrary/
-[Tt]emp/
-[Oo]bj/
-[Bb]uild/
-[Bb]uilds/
-[Ll]ogs/
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+
+# MemoryCaptures can get excessive in size.
+# They also could contain extremely sensitive data
+/[Mm]emoryCaptures/
+
+# Recordings can get excessive in size
+/[Rr]ecordings/
 
 # Uncomment this line if you wish to ignore the asset store tools plugin
-# [Aa]ssets/AssetStoreTools*
+# /[Aa]ssets/AssetStoreTools*
+
+# Autogenerated Jetbrains Rider plugin
+/[Aa]ssets/Plugins/Editor/JetBrains*
 
 # IDEs
 .vs/
@@ -43,7 +54,16 @@ sysinfo.txt
 
 # Builds
 *.apk
+*.aab
 *.unitypackage
+*.app
 
 # Crashlytics generated file
 crashlytics-build.properties
+
+# Packed Addressables
+/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
+
+# Temporary auto-generated Android Assets
+/[Aa]ssets/[Ss]treamingAssets/aa.meta
+/[Aa]ssets/[Ss]treamingAssets/aa/*
diff --git a/unity-project-with-correct-tests/.vscode/settings.json b/unity-project-with-correct-tests/.vscode/settings.json
@@ -0,0 +1,54 @@
+{
+  "files.exclude": {
+    "**/.DS_Store": true,
+    "**/.git": true,
+    "**/.gitmodules": true,
+    "**/*.booproj": true,
+    "**/*.pidb": true,
+    "**/*.suo": true,
+    "**/*.user": true,
+    "**/*.userprefs": true,
+    "**/*.unityproj": true,
+    "**/*.dll": true,
+    "**/*.exe": true,
+    "**/*.pdf": true,
+    "**/*.mid": true,
+    "**/*.midi": true,
+    "**/*.wav": true,
+    "**/*.gif": true,
+    "**/*.ico": true,
+    "**/*.jpg": true,
+    "**/*.jpeg": true,
+    "**/*.png": true,
+    "**/*.psd": true,
+    "**/*.tga": true,
+    "**/*.tif": true,
+    "**/*.tiff": true,
+    "**/*.3ds": true,
+    "**/*.3DS": true,
+    "**/*.fbx": true,
+    "**/*.FBX": true,
+    "**/*.lxo": true,
+    "**/*.LXO": true,
+    "**/*.ma": true,
+    "**/*.MA": true,
+    "**/*.obj": true,
+    "**/*.OBJ": true,
+    "**/*.asset": true,
+    "**/*.cubemap": true,
+    "**/*.flare": true,
+    "**/*.mat": true,
+    "**/*.meta": true,
+    "**/*.prefab": true,
+    "**/*.unity": true,
+    "build/": true,
+    "Build/": true,
+    "Library/": true,
+    "library/": true,
+    "obj/": true,
+    "Obj/": true,
+    "ProjectSettings/": true,
+    "temp/": true,
+    "Temp/": true
+  }
+}
diff --git a/unity-project-with-correct-tests/Packages/manifest.json b/unity-project-with-correct-tests/Packages/manifest.json
@@ -1,14 +1,15 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.ext.nunit": "1.0.0",
-    "com.unity.ide.rider": "1.1.0",
-    "com.unity.ide.vscode": "1.1.2",
-    "com.unity.package-manager-ui": "2.2.0",
-    "com.unity.test-framework": "1.0.18",
-    "com.unity.testtools.codecoverage": "1.1.1",
-    "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.1.0",
+    "com.unity.ai.navigation": "1.1.4",
+    "com.unity.collab-proxy": "2.0.5",
+    "com.unity.ext.nunit": "1.0.6",
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.18",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.test-framework": "1.1.33",
+    "com.unity.testtools.codecoverage": "1.2.4",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.7.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",