Convert version major and minor to numbers (#180)

* Convert version major and minor to numbers

* fix linting error

Co-authored-by: Webber Takken <webber@takken.io>

action/steps/activate.sh

@@ -24,9 +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' \
+  ACTIVATION_OUTPUT=$(unity-editor \
-    /opt/Unity/Editor/Unity \
-      -batchmode \
       -nographics \
       -logFile /dev/stdout \
       -quit \
@@ -63,15 +61,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' \
+  unity-editor \
-    /opt/Unity/Editor/Unity \
+    -batchmode \
-      -batchmode \
+    -nographics \
-      -nographics \
+    -logFile /dev/stdout \
-      -logFile /dev/stdout \
+    -quit \
-      -quit \
+    -serial "$UNITY_SERIAL" \
-      -serial "$UNITY_SERIAL" \
+    -username "$UNITY_EMAIL" \
-      -username "$UNITY_EMAIL" \
+    -password "$UNITY_PASSWORD"
-      -password "$UNITY_PASSWORD"
 
   # Store the exit code from the verify command
   UNITY_EXIT_CODE=$?

action/steps/build.sh

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

action/steps/return_license.sh

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

src/model/image-tag.js

@@ -1,11 +1,11 @@
-import { has, get, trimEnd, trimStart } from 'lodash-es';
+import { trimEnd, trimStart } from 'lodash-es';
 import Platform from './platform';
 
 class ImageTag {
   constructor(imageProperties) {
     const {
-      repository = 'gableroux',
+      repository = 'unityci',
-      name = 'unity3d',
+      name = 'editor',
       version = '2019.2.11f1',
       platform,
       customImage,
@@ -15,15 +15,7 @@ class ImageTag {
       throw new Error(`Invalid version "${version}".`);
     }
 
-    if (!has(ImageTag.targetPlatformToImageSuffixMap, platform)) {
+    const builderPlatform = ImageTag.getTargetPlatformToImageSuffixMap(platform, version);
-      throw new Error(`Platform "${platform}" is currently not supported.`);
-    }
-
-    const builderPlatform = get(
-      ImageTag.targetPlatformToImageSuffixMap,
-      platform,
-      ImageTag.imageSuffixes.generic,
-    );
 
     Object.assign(this, { repository, name, version, platform, builderPlatform, customImage });
   }
@@ -36,40 +28,81 @@ class ImageTag {
     return {
       generic: '',
       webgl: 'webgl',
-      mac: 'mac',
+      mac: 'mac-mono',
-      windows: 'windows',
+      windows: 'windows-mono',
+      linux: 'base',
+      linuxIl2cpp: 'linux-il2cpp',
       android: 'android',
       ios: 'ios',
       facebook: 'facebook',
     };
   }
 
-  static get targetPlatformToImageSuffixMap() {
+  static getTargetPlatformToImageSuffixMap(platform, version) {
-    const { generic, webgl, mac, windows, android, ios, facebook } = ImageTag.imageSuffixes;
+    const {
+      generic,
+      webgl,
+      mac,
+      windows,
+      linux,
+      linuxIl2cpp,
+      android,
+      ios,
+      facebook,
+    } = ImageTag.imageSuffixes;
 
+    const [major, minor] = version.split('.').map((digit) => Number(digit));
     // @see: https://docs.unity3d.com/ScriptReference/BuildTarget.html
-    return {
+    switch (platform) {
-      [Platform.types.StandaloneOSX]: mac,
+      case Platform.types.StandaloneOSX:
-      [Platform.types.StandaloneWindows]: windows,
+        return mac;
-      [Platform.types.StandaloneWindows64]: windows,
+      case Platform.types.StandaloneWindows:
-      [Platform.types.StandaloneLinux64]: windows,
+        return windows;
-      [Platform.types.iOS]: ios,
+      case Platform.types.StandaloneWindows64:
-      [Platform.types.Android]: android,
+        return windows;
-      [Platform.types.WebGL]: webgl,
+      case Platform.types.StandaloneLinux64: {
-      [Platform.types.WSAPlayer]: windows,
+        // Unity versions before 2019.3 do not support il2cpp
-      [Platform.types.PS4]: windows,
+        if (major >= 2020 || (major === 2019 && minor >= 3)) {
-      [Platform.types.XboxOne]: windows,
+          return linuxIl2cpp;
-      [Platform.types.tvOS]: windows,
+        }
-      [Platform.types.Switch]: windows,
+        return linux;
+      }
+      case Platform.types.iOS:
+        return ios;
+      case Platform.types.Android:
+        return android;
+      case Platform.types.WebGL:
+        return webgl;
+      case Platform.types.WSAPlayer:
+        return windows;
+      case Platform.types.PS4:
+        return windows;
+      case Platform.types.XboxOne:
+        return windows;
+      case Platform.types.tvOS:
+        return windows;
+      case Platform.types.Switch:
+        return windows;
       // Unsupported
-      [Platform.types.Lumin]: windows,
+      case Platform.types.Lumin:
-      [Platform.types.BJM]: windows,
+        return windows;
-      [Platform.types.Stadia]: windows,
+      case Platform.types.BJM:
-      [Platform.types.Facebook]: facebook,
+        return windows;
-      [Platform.types.NoTarget]: generic,
+      case Platform.types.Stadia:
+        return windows;
+      case Platform.types.Facebook:
+        return facebook;
+      case Platform.types.NoTarget:
+        return generic;
+
       // Test specific
-      [Platform.types.Test]: generic,
+      case Platform.types.Test:
-    };
+        return generic;
+      default:
+        throw new Error(`
+          Platform must be one of the ones described in the documentation.
+          "${platform}" is currently not supported.`);
+    }
   }
 
   get tag() {
@@ -87,7 +120,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',
+    repository: 'unityci',
-    name: 'unity3d',
+    name: 'editor',
-    image: 'gableroux/unity3d',
+    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`);
     });
   });
 });