feat: Add support for macos game-ci#211

Kariaro · Dec 27, 2022 · 97a959b · 97a959b
1 parent d982116
commit 97a959b
Show file tree

Hide file tree

Showing 12 changed files with 311 additions and 39 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,8 +24,8 @@ jobs:
   #      - run: yarn build --quiet && git diff --quiet action || { echo "ERROR - index.js is different from repository version. Forgot to run `yarn build`?" ; exit 62; }
 
   testAllModesLikeInTheReadme:
-    name: Test in ${{ matrix.testMode }} on version ${{ matrix.unityVersion }}
-    runs-on: ubuntu-latest
+    name: Test in ${{ matrix.testMode }} on version ${{ matrix.unityVersion }} on system ${{ matrix.system }}
+    runs-on: ${{ matrix.system }}
     strategy:
       fail-fast: false
       matrix:
@@ -36,6 +36,9 @@ jobs:
         testMode:
           - playmode
           - editmode
+        system:
+          - ubuntu-latest
+          - macos-latest
     steps:
       ###########################
       #         Checkout        #

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/main.ts b/src/main.ts
@@ -1,5 +1,5 @@
 import * as core from '@actions/core';
-import { Action, Docker, ImageTag, Input, Output, ResultsCheck } from './model';
+import { Action, Docker, ImageTag, Input, MacRunner, Output, ResultsCheck } from './model';
 
 export async function run() {
   try {
@@ -26,23 +26,41 @@ export async function run() {
     const runnerContext = Action.runnerContext();
 
     try {
-      await Docker.run(baseImage, {
-        actionFolder,
-        editorVersion,
-        workspace,
-        projectPath,
-        customParameters,
-        testMode,
-        coverageOptions,
-        artifactsPath,
-        useHostNetwork,
-        sshAgent,
-        gitPrivateToken,
-        githubToken,
-        chownFilesTo,
-        unityLicensingServer,
-        ...runnerContext,
-      });
+      await (process.platform === 'darwin'
+        ? MacRunner.run({
+            actionFolder,
+            editorVersion,
+            workspace,
+            projectPath,
+            customParameters,
+            testMode,
+            coverageOptions,
+            artifactsPath,
+            useHostNetwork,
+            sshAgent,
+            gitPrivateToken,
+            githubToken,
+            chownFilesTo,
+            unityLicensingServer,
+            ...runnerContext,
+          })
+        : Docker.run(baseImage, {
+            actionFolder,
+            editorVersion,
+            workspace,
+            projectPath,
+            customParameters,
+            testMode,
+            coverageOptions,
+            artifactsPath,
+            useHostNetwork,
+            sshAgent,
+            gitPrivateToken,
+            githubToken,
+            chownFilesTo,
+            unityLicensingServer,
+            ...runnerContext,
+          }));
     } finally {
       await Output.setArtifactsPath(artifactsPath);
       await Output.setCoveragePath('CodeCoverage');

diff --git a/src/model/action.test.ts b/src/model/action.test.ts
@@ -5,7 +5,11 @@ import path from 'path';
 describe('Action', () => {
   describe('compatibility check', () => {
     it('throws for anything other than linux or windows', () => {
-      if (process.platform !== 'linux' && process.platform !== 'win32') {
+      if (
+        process.platform !== 'linux' &&
+        process.platform !== 'win32' &&
+        process.platform !== 'darwin'
+      ) {
         expect(() => Action.checkCompatibility()).toThrow();
       } else {
         expect(() => Action.checkCompatibility()).not.toThrow();

diff --git a/src/model/action.ts b/src/model/action.ts
@@ -7,7 +7,7 @@ export interface RunnerContext {
 
 const Action = {
   get supportedPlatforms() {
-    return ['linux', 'win32'];
+    return ['linux', 'win32', 'darwin'];
   },
 
   get isRunningLocally() {

diff --git a/src/model/image-tag.ts b/src/model/image-tag.ts
@@ -58,6 +58,8 @@ class ImageTag {
         return 'ubuntu';
       case 'win32':
         return 'windows';
+      case 'darwin':
+        return 'macos';
       default:
         throw new Error(
           `The Operating System of this runner, "${platform}", is not yet supported.`,
@@ -71,6 +73,8 @@ class ImageTag {
         return Platform.types.StandaloneLinux64;
       case 'win32':
         return Platform.types.StandaloneWindows;
+      case 'darwin':
+        return Platform.types.StandaloneOSX;
       default:
         throw new Error(
           `The Operating System of this runner, "${platform}", is not yet supported.`,

diff --git a/src/model/index.ts b/src/model/index.ts
@@ -2,5 +2,6 @@ export { default as Action } from './action';
 export { default as Docker } from './docker';
 export { default as ImageTag } from './image-tag';
 export { default as Input } from './input';
+export { default as MacRunner } from './mac-runner';
 export { default as Output } from './output';
 export { default as ResultsCheck } from './results-check';
diff --git a/src/model/mac-runner.test.ts b/src/model/mac-runner.test.ts
@@ -0,0 +1,15 @@
+import Action from './action';
+import MacRunner from './mac-runner';
+
+describe('MacRunner', () => {
+  it.skip('runs', async () => {
+    const parameters = {
+      workspace: Action.rootFolder,
+      projectPath: `${Action.rootFolder}/test-project`,
+      buildName: 'someBuildName',
+      buildsPath: 'build',
+      method: '',
+    };
+    await MacRunner.run(parameters);
+  });
+});