Hotfixes for 4.2.0 (#630)

* Fix mac env variables not getting skip activation * Fix image tag for linux il2cpp. Force tests to use il2cpp * Scripting backend is always il2cpp
game-ci · Feb 19, 2024 · f4d2cce · f4d2cce
1 parent 4ae184c
commit f4d2cce
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 931 deletions.
diff --git a/.github/workflows/build-tests-mac.yml b/.github/workflows/build-tests-mac.yml
@@ -45,13 +45,6 @@ jobs:
             Library-${{ matrix.projectPath }}-macos-
             Library-
 
-      ###########################
-      #  Set Scripting Backend  #
-      ###########################
-      - name: Set Scripting Backend To il2cpp
-        run: |
-          mv -f "./test-project/ProjectSettings/ProjectSettingsIl2cpp.asset" "./test-project/ProjectSettings/ProjectSettings.asset"
-
       ###########################
       #          Build          #
       ###########################

diff --git a/.github/workflows/build-tests-windows.yml b/.github/workflows/build-tests-windows.yml
@@ -47,13 +47,6 @@ jobs:
             Library-${{ matrix.projectPath }}-windows-
             Library-
 
-      ###########################
-      #  Set Scripting Backend  #
-      ###########################
-      - name: Set Scripting Backend To il2cpp
-        run: |
-          Move-Item -Path "./test-project/ProjectSettings/ProjectSettingsIl2cpp.asset" -Destination "./test-project/ProjectSettings/ProjectSettings.asset" -Force
-
       ###########################
       #          Build          #
       ###########################

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/image-tag.ts b/src/model/image-tag.ts
@@ -17,6 +17,7 @@ class ImageTag {
       buildPlatform,
       containerRegistryRepository,
       containerRegistryImageVersion,
+      providerStrategy,
     } = imageProperties;
 
     if (!ImageTag.versionPattern.test(editorVersion)) {
@@ -31,7 +32,11 @@ class ImageTag {
     this.repository = containerRegistryRepository;
     this.editorVersion = editorVersion;
     this.targetPlatform = targetPlatform;
-    this.builderPlatform = ImageTag.getTargetPlatformToTargetPlatformSuffixMap(targetPlatform, editorVersion);
+    this.builderPlatform = ImageTag.getTargetPlatformToTargetPlatformSuffixMap(
+      targetPlatform,
+      editorVersion,
+      providerStrategy,
+    );
     this.imagePlatformPrefix = ImageTag.getImagePlatformPrefixes(buildPlatform);
     this.imageRollingVersion = Number(containerRegistryImageVersion); // Will automatically roll to the latest non-breaking version.
   }
@@ -72,7 +77,11 @@ class ImageTag {
     }
   }
 
-  static getTargetPlatformToTargetPlatformSuffixMap(platform: string, version: string): string {
+  static getTargetPlatformToTargetPlatformSuffixMap(
+    platform: string,
+    version: string,
+    providerStrategy: string,
+  ): string {
     const { generic, webgl, mac, windows, windowsIl2cpp, wsaPlayer, linux, linuxIl2cpp, android, ios, tvos, facebook } =
       ImageTag.targetPlatformSuffixes;
 
@@ -100,8 +109,12 @@ class ImageTag {
         return windows;
       case Platform.types.StandaloneLinux64: {
         // Unity versions before 2019.3 do not support il2cpp
-        if (process.env.USE_IL2CPP === 'true' && (major >= 2020 || (major === 2019 && minor >= 3))) {
-          return linuxIl2cpp;
+        if (major >= 2020 || (major === 2019 && minor >= 3)) {
+          if (providerStrategy === 'local') {
+            return linuxIl2cpp;
+          } else {
+            return process.env.USE_IL2CPP === 'true' ? linuxIl2cpp : linux;
+          }
         }
 
         return linux;

diff --git a/src/model/platform-setup/setup-mac.ts b/src/model/platform-setup/setup-mac.ts
@@ -168,6 +168,7 @@ class SetupMac {
     process.env.UNITY_VERSION = buildParameters.editorVersion;
     process.env.UNITY_SERIAL = buildParameters.unitySerial;
     process.env.UNITY_LICENSING_SERVER = buildParameters.unityLicensingServer;
+    process.env.SKIP_ACTIVATION = buildParameters.skipActivation;
     process.env.PROJECT_PATH = buildParameters.projectPath;
     process.env.BUILD_TARGET = buildParameters.targetPlatform;
     process.env.BUILD_NAME = buildParameters.buildName;

diff --git a/test-project/ProjectSettings/ProjectSettings.asset b/test-project/ProjectSettings/ProjectSettings.asset
@@ -806,6 +806,8 @@ PlayerSettings:
   platformArchitecture: {}
   scriptingBackend:
     Android: 1
+    Server: 1
+    Standalone: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}
@@ -821,16 +823,16 @@ PlayerSettings:
   apiCompatibilityLevelPerPlatform: {}
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
-  metroPackageName: Template_3D
-  metroPackageVersion: 
+  metroPackageName: Template3D
+  metroPackageVersion: 1.0.0.0
   metroCertificatePath: 
   metroCertificatePassword: 
   metroCertificateSubject: 
   metroCertificateIssuer: 
   metroCertificateNotAfter: 0000000000000000
   metroApplicationDescription: Template_3D
   wsaImages: {}
-  metroTileShortName: 
+  metroTileShortName: TestProject
   metroTileShowName: 0
   metroMediumTileShowName: 0
   metroLargeTileShowName: 0