docker repo migrated (#77)

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

action.yml

@@ -6,6 +6,28 @@ inputs:
     required: false
     default: '2019.2.11f1'
     description: 'Version of unity to use for testing the project.'
+  customImage:
+    required: false
+    default: ''
+    description: 'Specific docker image that should be used for testing the project'
+  projectPath:
+    required: false
+    description: 'Path to the Unity project to be tested.'
+  testMode:
+    required: false
+    default: 'all'
+    description: 'The type of tests to be run by the test runner.'
+  artifactsPath:
+    required: false
+    default: 'artifacts'
+    description: 'Path where test artifacts should be stored.'
+  useNetworkHost:
+    required: false
+    default: false
+    description: 'Initialises Docker using the hosts network.'
+  customParameters:
+    required: false
+    description: 'Extra parameters to configure the Unity editor run.'
 outputs:
   artifactsPath:
     description: 'Path where the artifacts are stored'

action/steps/activate.sh

@@ -24,13 +24,12 @@ 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 \
-      -batchmode \
-      -nographics \
-      -logFile /dev/stdout \
-      -quit \
-      -manualLicenseFile $FILE_PATH)
+  ACTIVATION_OUTPUT=$(unity-editor \
+    -batchmode \
+    -nographics \
+    -logFile /dev/stdout \
+    -quit \
+    -manualLicenseFile $FILE_PATH)
 
   # Store the exit code from the verify command
   UNITY_EXIT_CODE=$?
@@ -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/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

action/steps/run_tests.sh

@@ -74,19 +74,18 @@ if [ $EDIT_MODE = true ]; then
   echo "#   Testing in EditMode   #"
   echo "###########################"
   echo ""
-  xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-    /opt/Unity/Editor/Unity \
-      -batchmode \
-      -logFile "$FULL_ARTIFACTS_PATH/editmode.log" \
-      -projectPath "$UNITY_PROJECT_PATH" \
-      -runTests \
-      -testPlatform editmode \
-      -testResults "$FULL_ARTIFACTS_PATH/editmode-results.xml" \
-      $CUSTOM_PARAMETERS
-      
+  unity-editor \
+    -batchmode \
+    -logFile "$FULL_ARTIFACTS_PATH/editmode.log" \
+    -projectPath "$UNITY_PROJECT_PATH" \
+    -runTests \
+    -testPlatform editmode \
+    -testResults "$FULL_ARTIFACTS_PATH/editmode-results.xml" \
+    $CUSTOM_PARAMETERS
+
   # Catch exit code
   EDIT_MODE_EXIT_CODE=$?
-  
+
   # Print unity log output
   cat "$FULL_ARTIFACTS_PATH/editmode.log"
 
@@ -112,16 +111,15 @@ if [ $PLAY_MODE = true ]; then
   echo "#   Testing in PlayMode   #"
   echo "###########################"
   echo ""
-  xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-    /opt/Unity/Editor/Unity \
-      -batchmode \
-      -logFile "$FULL_ARTIFACTS_PATH/playmode.log" \
-      -projectPath "$UNITY_PROJECT_PATH" \
-      -runTests \
-      -testPlatform playmode \
-      -testResults "$FULL_ARTIFACTS_PATH/playmode-results.xml" \
-      $CUSTOM_PARAMETERS
-      
+  unity-editor \
+    -batchmode \
+    -logFile "$FULL_ARTIFACTS_PATH/playmode.log" \
+    -projectPath "$UNITY_PROJECT_PATH" \
+    -runTests \
+    -testPlatform playmode \
+    -testResults "$FULL_ARTIFACTS_PATH/playmode-results.xml" \
+    $CUSTOM_PARAMETERS
+
   # Catch exit code
   PLAY_MODE_EXIT_CODE=$?
 

src/index.js

@@ -7,13 +7,14 @@ async function action() {
   const { dockerfile, workspace, actionFolder } = Action;
   const {
     unityVersion,
+    customImage,
     projectPath,
     testMode,
     artifactsPath,
     useHostNetwork,
     customParameters,
   } = Input.getFromUser();
-  const baseImage = ImageTag.createForBase(unityVersion);
+  const baseImage = ImageTag.createForBase({ version: unityVersion, customImage });
 
   // Build docker image
   const actionImage = await Docker.build({ path: actionFolder, dockerfile, baseImage });

src/model/docker.test.js

@@ -6,15 +6,20 @@ describe('Docker', () => {
   it('builds', async () => {
     const path = Action.actionFolder;
     const dockerfile = `${path}/Dockerfile`;
-    const baseImage = new ImageTag({
+    const image = new ImageTag({
       repository: '',
       name: 'alpine',
       version: '3',
     });
 
+    const baseImage = {
+      toString: () => image.toString().slice(0, image.toString().lastIndexOf('-base-0')),
+      version: image.version,
+    };
+
     const tag = await Docker.build({ path, dockerfile, baseImage }, true);
 
     expect(tag).toBeInstanceOf(ImageTag);
-    expect(tag.toString()).toStrictEqual('unity-action:3');
+    expect(tag.toString()).toStrictEqual('unity-action:3-base-0');
   }, 240000);
 });

src/model/image-tag.js

@@ -1,10 +1,10 @@
 import { trimStart } from 'lodash-es';
 
 class ImageTag {
-  static createForBase(version) {
-    const repository = 'gableroux';
-    const name = 'unity3d';
-    return new this({ repository, name, version });
+  static createForBase({ version, customImage }) {
+    const repository = 'unityci';
+    const name = 'editor';
+    return new this({ repository, name, version, customImage });
   }
 
   static createForAction(version) {
@@ -13,12 +13,12 @@ class ImageTag {
     return new this({ repository, name, version });
   }
 
-  constructor({ repository = '', name, version }) {
+  constructor({ repository = '', name, version, customImage }) {
     if (!ImageTag.versionPattern.test(version)) {
       throw new Error(`Invalid version "${version}".`);
     }
 
-    Object.assign(this, { repository, name, version });
+    Object.assign(this, { repository, name, version, customImage });
   }
 
   static get versionPattern() {
@@ -34,7 +34,11 @@ class ImageTag {
   }
 
   toString() {
-    return `${this.image}:${this.tag}`;
+    if (this.customImage && this.customImage !== '') {
+      return this.customImage;
+    }
+
+    return `${this.image}:${this.tag}-base-0`;
   }
 }
 

src/model/image-tag.test.js

@@ -30,9 +30,18 @@ describe('UnityImageVersion', () => {
 
   describe('toString', () => {
     it('returns the correct version', () => {
-      const image = ImageTag.createForBase('2099.1.1111');
+      const image = ImageTag.createForBase({ version: '2099.1.1111' });
 
-      expect(image.toString()).toStrictEqual(`gableroux/unity3d:2099.1.1111`);
+      expect(image.toString()).toStrictEqual(`unityci/editor:2099.1.1111-base-0`);
+    });
+
+    it('returns customImage if given', () => {
+      const image = ImageTag.createForBase({
+        version: '2099.1.1111',
+        customImage: 'unityci/editor:2099.1.1111-base-0',
+      });
+
+      expect(image.toString()).toStrictEqual(image.customImage);
     });
   });
 });