Merge branch 'BLaZeKiLL-fix/unity-alias' into main

action/steps/activate.sh

@@ -24,8 +24,7 @@ if [[ -n "$UNITY_LICENSE" ]] || [[ -n "$UNITY_LICENSE_FILE" ]]; then
   fi
 
   # Activate license
-  ACTIVATION_OUTPUT=$(xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-    /opt/Unity/Editor/Unity \
+  ACTIVATION_OUTPUT=$(unity-editor \
       -batchmode \
       -nographics \
       -logFile /dev/stdout \
@@ -63,15 +62,14 @@ elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
   echo "Requesting activation (professional license)"
 
   # Activate license
-  xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-    /opt/Unity/Editor/Unity \
-      -batchmode \
-      -nographics \
-      -logFile /dev/stdout \
-      -quit \
-      -serial "$UNITY_SERIAL" \
-      -username "$UNITY_EMAIL" \
-      -password "$UNITY_PASSWORD"
+  unity-editor \
+    -batchmode \
+    -nographics \
+    -logFile /dev/stdout \
+    -quit \
+    -serial "$UNITY_SERIAL" \
+    -username "$UNITY_EMAIL" \
+    -password "$UNITY_PASSWORD"
 
   # Store the exit code from the verify command
   UNITY_EXIT_CODE=$?

action/steps/build.sh

@@ -108,25 +108,24 @@ echo "#    Building platform    #"
 echo "###########################"
 echo ""
 
-xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-  /opt/Unity/Editor/Unity \
-    -batchmode \
-    -nographics \
-    -logfile /dev/stdout \
-    -quit \
-    -customBuildName "$BUILD_NAME" \
-    -projectPath "$UNITY_PROJECT_PATH" \
-    -buildTarget "$BUILD_TARGET" \
-    -customBuildTarget "$BUILD_TARGET" \
-    -customBuildPath "$CUSTOM_BUILD_PATH" \
-    -executeMethod "$BUILD_METHOD" \
-    -buildVersion "$VERSION" \
-    -androidVersionCode "$ANDROID_VERSION_CODE" \
-    -androidKeystoreName "$ANDROID_KEYSTORE_NAME" \
-    -androidKeystorePass "$ANDROID_KEYSTORE_PASS" \
-    -androidKeyaliasName "$ANDROID_KEYALIAS_NAME" \
-    -androidKeyaliasPass "$ANDROID_KEYALIAS_PASS" \
-    $CUSTOM_PARAMETERS
+unity-editor \
+  -batchmode \
+  -nographics \
+  -logfile /dev/stdout \
+  -quit \
+  -customBuildName "$BUILD_NAME" \
+  -projectPath "$UNITY_PROJECT_PATH" \
+  -buildTarget "$BUILD_TARGET" \
+  -customBuildTarget "$BUILD_TARGET" \
+  -customBuildPath "$CUSTOM_BUILD_PATH" \
+  -executeMethod "$BUILD_METHOD" \
+  -buildVersion "$VERSION" \
+  -androidVersionCode "$ANDROID_VERSION_CODE" \
+  -androidKeystoreName "$ANDROID_KEYSTORE_NAME" \
+  -androidKeystorePass "$ANDROID_KEYSTORE_PASS" \
+  -androidKeyaliasName "$ANDROID_KEYALIAS_NAME" \
+  -androidKeyaliasPass "$ANDROID_KEYALIAS_PASS" \
+  $CUSTOM_PARAMETERS
 
 # Catch exit code
 BUILD_EXIT_CODE=$?

action/steps/return_license.sh

@@ -6,11 +6,10 @@ if [[ -n "$UNITY_SERIAL" ]]; then
   #
   # This will return the license that is currently in use.
   #
-  xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-    /opt/Unity/Editor/Unity \
-      -batchmode \
-      -nographics \
-      -logFile /dev/stdout \
-      -quit \
-      -returnlicense
+  unity-editor \
+    -batchmode \
+    -nographics \
+    -logFile /dev/stdout \
+    -quit \
+    -returnlicense
 fi

src/model/image-tag.js

@@ -4,8 +4,8 @@ import Platform from './platform';
 class ImageTag {
   constructor(imageProperties) {
     const {
-      repository = 'gableroux',
-      name = 'unity3d',
+      repository = 'unityci',
+      name = 'editor',
       version = '2019.2.11f1',
       platform,
       customImage,
@@ -36,23 +36,24 @@ class ImageTag {
     return {
       generic: '',
       webgl: 'webgl',
-      mac: 'mac',
-      windows: 'windows',
+      mac: 'mac-mono',
+      windows: 'windows-mono',
+      linux: 'base',
       android: 'android',
       ios: 'ios',
       facebook: 'facebook',
     };
   }
 
   static get targetPlatformToImageSuffixMap() {
-    const { generic, webgl, mac, windows, android, ios, facebook } = ImageTag.imageSuffixes;
+    const { generic, webgl, mac, windows, linux, android, ios, facebook } = ImageTag.imageSuffixes;
 
     // @see: https://docs.unity3d.com/ScriptReference/BuildTarget.html
     return {
       [Platform.types.StandaloneOSX]: mac,
       [Platform.types.StandaloneWindows]: windows,
       [Platform.types.StandaloneWindows64]: windows,
-      [Platform.types.StandaloneLinux64]: windows,
+      [Platform.types.StandaloneLinux64]: linux,
       [Platform.types.iOS]: ios,
       [Platform.types.Android]: android,
       [Platform.types.WebGL]: webgl,
@@ -87,7 +88,7 @@ class ImageTag {
       return this.customImage;
     }
 
-    return `${image}:${tag}`;
+    return `${image}:${tag}-0`; // '0' here represents the docker repo version
   }
 }
 

src/model/image-tag.test.js

@@ -10,9 +10,9 @@ describe('UnityImageVersion', () => {
   };
 
   const defaults = {
-    repository: 'gableroux',
-    name: 'unity3d',
-    image: 'gableroux/unity3d',
+    repository: 'unityci',
+    name: 'editor',
+    image: 'unityci/editor',
   };
 
   describe('constructor', () => {
@@ -49,7 +49,7 @@ describe('UnityImageVersion', () => {
     it('returns the correct version', () => {
       const image = new ImageTag({ version: '2099.1.1111', platform: some.platform });
 
-      expect(image.toString()).toStrictEqual(`${defaults.image}:2099.1.1111`);
+      expect(image.toString()).toStrictEqual(`${defaults.image}:2099.1.1111-0`);
     });
     it('returns customImage if given', () => {
       const image = new ImageTag({
@@ -64,13 +64,13 @@ describe('UnityImageVersion', () => {
     it('returns the specific build platform', () => {
       const image = new ImageTag({ version: '2019.2.11f1', platform: 'WebGL' });
 
-      expect(image.toString()).toStrictEqual(`${defaults.image}:2019.2.11f1-webgl`);
+      expect(image.toString()).toStrictEqual(`${defaults.image}:2019.2.11f1-webgl-0`);
     });
 
     it('returns no specific build platform for generic targetPlatforms', () => {
       const image = new ImageTag({ platform: 'NoTarget' });
 
-      expect(image.toString()).toStrictEqual(`${defaults.image}:2019.2.11f1`);
+      expect(image.toString()).toStrictEqual(`${defaults.image}:2019.2.11f1-0`);
     });
   });
 });