unity-action@v2.0.1 (#11)

- added `-force-graphics` override for when `-nographics` is auto added
- updated auto added `-nographics` rules to only auto add for unity 2019+

Author: StephenHodgson

.github/workflows/validate.yml

@@ -1,5 +1,7 @@
 name: validate
 on:
+  schedule:
+    - cron: '0 0 * * 0' # Every Sunday at midnight
   push:
     branches: ['main']
   pull_request:

README.md

@@ -40,5 +40,5 @@ jobs:
 | `editor-path` | The path to the unity editor installation you want to use to execute the arguments with. | If `UNITY_EDITOR_PATH` environment variable is not set. | `env.UNITY_EDITOR_PATH` |
 | `project-path` | The path to the unity project you want to use when executing arguments. | If `UNITY_PROJECT_PATH` environment variable is not set, or if it isn't required for the command. | `env.UNITY_PROJECT_PATH` |
 | `build-target` | The build target to use when executing arguments. | false | |
-| `args` | The [arguments](https://docs.unity3d.com/Manual/EditorCommandLineArguments.html) to use when executing commands to the editor. | true | `-quit -batchmode -nographics` |
+| `args` | The [arguments](https://docs.unity3d.com/Manual/EditorCommandLineArguments.html) to use when executing commands to the editor. (Note: use `-force-graphics` to override auto-added `-nographics` argument) | true | `-quit -batchmode -nographics` |
 | `log-name` | The name of the log file to create when running the commands. | false | `Unity-yyyyMMddTHHmmss` |

dist/index.js

@@ -25658,6 +25658,7 @@ const WORKSPACE = process.env.GITHUB_WORKSPACE;
 const UNITY_EDITOR_PATH = process.env.UNITY_EDITOR_PATH;
 const UNITY_PROJECT_PATH = process.env.UNITY_PROJECT_PATH;
 async function ValidateInputs() {
+    var _a;
     let editorPath = core.getInput(`editor-path`) || UNITY_EDITOR_PATH;
     if (!editorPath) {
         throw Error(`Missing editor-path or UNITY_EDITOR_PATH`);
@@ -25673,7 +25674,16 @@ async function ValidateInputs() {
     if (!inputArgs.includes(`-batchmode`)) {
         args.push(`-batchmode`);
     }
-    if (!inputArgs.includes(`-nographics`)) {
+    const match = editorPath.match(/(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)/);
+    if (!match) {
+        throw Error(`Invalid Unity Editor Path: ${editorPath}`);
+    }
+    const unityMajorVersion = (_a = match.groups) === null || _a === void 0 ? void 0 : _a.major;
+    if (!unityMajorVersion) {
+        throw Error(`Invalid Unity Major Version: ${editorPath}`);
+    }
+    const autoAddNographics = parseInt(unityMajorVersion, 10) > 2018;
+    if (autoAddNographics && !inputArgs.includes(`-nographics`) && !inputArgs.includes(`-force-graphics`)) {
         args.push(`-nographics`);
     }
     if (!inputArgs.includes(`-buildTarget`)) {
@@ -25788,7 +25798,30 @@ async function exec(command, onPid) {
     if (!logPath) {
         throw Error('Log file path not specified in command arguments');
     }
-    const unityProcess = (0, child_process_1.spawn)(command.editorPath, command.args, { stdio: ['ignore', 'ignore', 'ignore'], detached: true });
+    let unityProcess;
+    if (process.platform === 'linux' && !command.args.includes('-nographics')) {
+        const io = __nccwpck_require__(7436);
+        const xvfbRun = await io.which('xvfb-run', true);
+        unityProcess = (0, child_process_1.spawn)(xvfbRun, [command.editorPath, ...command.args], {
+            stdio: ['ignore', 'ignore', 'ignore'],
+            detached: true,
+            env: {
+                ...process.env,
+                DISPLAY: ':99',
+                UNITY_THISISABUILDMACHINE: '1'
+            }
+        });
+    }
+    else {
+        unityProcess = (0, child_process_1.spawn)(command.editorPath, command.args, {
+            stdio: ['ignore', 'ignore', 'ignore'],
+            detached: true,
+            env: {
+                ...process.env,
+                UNITY_THISISABUILDMACHINE: '1'
+            }
+        });
+    }
     const processId = unityProcess.pid;
     if (!processId) {
         throw new Error('Failed to start Unity process!');
@@ -25834,6 +25867,7 @@ async function exec(command, onPid) {
             }
             await new Promise(res => setTimeout(res, logPollingInterval));
         }
+        process.stdout.write('\n');
     };
     const timeout = 10000;
     const tailPromise = tailLog();

dist/index.js.map

@@ -1,6 +1,6 @@
 {
   "name": "unity-action",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A Github Action to execute Unity Editor command line arguments.",
   "author": "buildalon",
   "repository": {

package-lock.json

@@ -24,7 +24,16 @@ export async function ValidateInputs(): Promise<UnityCommand> {
     if (!inputArgs.includes(`-batchmode`)) {
         args.push(`-batchmode`);
     }
-    if (!inputArgs.includes(`-nographics`)) {
+    const match = editorPath.match(/(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)/);
+    if (!match) {
+        throw Error(`Invalid Unity Editor Path: ${editorPath}`);
+    }
+    const unityMajorVersion = match.groups?.major;
+    if (!unityMajorVersion) {
+        throw Error(`Invalid Unity Major Version: ${editorPath}`);
+    }
+    const autoAddNographics = parseInt(unityMajorVersion, 10) > 2018;
+    if (autoAddNographics && !inputArgs.includes(`-nographics`) && !inputArgs.includes(`-force-graphics`)) {
         args.push(`-nographics`);
     }
     if (!inputArgs.includes(`-buildTarget`)) {

package.json

@@ -2,6 +2,7 @@ import core = require('@actions/core');
 import path = require('path');
 import fs = require('fs');
 import {
+    ChildProcessByStdio,
     spawn
 } from 'child_process';
 import {
@@ -58,7 +59,35 @@ async function exec(command: UnityCommand, onPid: (pid: ProcInfo) => void): Prom
     if (!logPath) {
         throw Error('Log file path not specified in command arguments');
     }
-    const unityProcess = spawn(command.editorPath, command.args, { stdio: ['ignore', 'ignore', 'ignore'], detached: true });
+    let unityProcess: ChildProcessByStdio<null, null, null>;
+    if (process.platform === 'linux' && !command.args.includes('-nographics')) {
+        const io = require('@actions/io');
+        const xvfbRun = await io.which('xvfb-run', true);
+        unityProcess = spawn(
+            xvfbRun,
+            [command.editorPath, ...command.args],
+            {
+                stdio: ['ignore', 'ignore', 'ignore'],
+                detached: true,
+                env: {
+                    ...process.env,
+                    DISPLAY: ':99',
+                    UNITY_THISISABUILDMACHINE: '1'
+                }
+            });
+    } else {
+        unityProcess = spawn(
+            command.editorPath,
+            command.args,
+            {
+                stdio: ['ignore', 'ignore', 'ignore'],
+                detached: true,
+                env: {
+                    ...process.env,
+                    UNITY_THISISABUILDMACHINE: '1'
+                }
+            });
+    }
     const processId = unityProcess.pid;
     if (!processId) {
         throw new Error('Failed to start Unity process!');
@@ -107,6 +136,9 @@ async function exec(command: UnityCommand, onPid: (pid: ProcInfo) => void): Prom
             }
             await new Promise(res => setTimeout(res, logPollingInterval));
         }
+        // Write a newline at the end of the log tail
+        // prevents appending logs from being printed on the same line
+        process.stdout.write('\n');
     };
     const timeout = 10000; // 10 seconds
     // Start log tailing in background