Add screen size configuration, update default (#9)

* Pass xvfb-server-args to start-xvfb.bash * Change to only screen size arg * Remove source map * Update default screen size. Echo screen size when running.
aganders3 · Dec 6, 2023 · 946613f · 946613f
1 parent 5124e2e
commit 946613f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/action.yml b/action.yml
@@ -28,6 +28,10 @@ inputs:
     description: 'directory where commands from `run` will be executed - defaults to cwd'
     required: false
     default: ""
+  xvfb-screen-size:
+    description: 'screen size passed to Xvfb'
+    required: false
+    default: '1280x1024x24'
   # snake_case alternatives for backward-compatibility
   # not adding deprecation notice at this time, but it can be done with 
   # <input_id>.deprecationMessage: "don't use this!"

diff --git a/dist/index.js b/dist/index.js
@@ -1,4 +1,4 @@
-require('./sourcemap-register.js');/******/ (() => { // webpackBootstrap
+/******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
 /***/ 109:
@@ -100,7 +100,7 @@ function startXvfb(env) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log("::group::starting XVfb");
         const options = { env: env };
-        const output = yield exec.getExecOutput("bash", [__nccwpck_require__.ab + "start-xvfb.bash"], options);
+        const output = yield exec.getExecOutput("bash", [__nccwpck_require__.ab + "start-xvfb.bash", core.getInput("xvfb-screen-size")], options);
         if (output.exitCode == 0) {
             const result = output.stdout.split("\n");
             console.log("sleep for 1000ms");
@@ -157,8 +157,8 @@ function main() {
             console.log(`running on ${process.platform}`);
             if (process.platform == "linux") {
                 yield installDeps(env);
-                const [pid, display] = yield startXvfb(env);
-                console.log(`xvfb pid=${pid}, display=${display}`);
+                const [pid, display, screen] = yield startXvfb(env);
+                console.log(`xvfb pid=${pid}, display=${display}, screen=${screen}`);
                 env.DISPLAY = `:${display}`;
                 yield linuxSetup(env);
             }
@@ -4303,5 +4303,4 @@ module.exports = require("util");
 /******/ 	module.exports = __webpack_exports__;
 /******/ 	
 /******/ })()
-;
-//# sourceMappingURL=index.js.map
+;
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/sourcemap-register.js b/dist/sourcemap-register.js
diff --git a/dist/start-xvfb.bash b/dist/start-xvfb.bash
@@ -21,9 +21,10 @@ find_free_servernum() {
 }
 
 SERVERNUM=$(find_free_servernum)
+SCREEN_SIZE=${1:-"1280x1024x24"}
 
-# TODO: allow configuration of screen
-Xvfb :$SERVERNUM -screen 0, 1024x768x16 > /tmp/xvfb-output 2>&1 &
+Xvfb :"$SERVERNUM" -screen 0 "$SCREEN_SIZE" > /tmp/xvfb-output 2>&1 &
 
 echo "$!"
 echo "$SERVERNUM"
+echo "$SCREEN_SIZE"
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "format": "prettier --write '**/*.ts'",
     "format-check": "prettier --check '**/*.ts'",
     "lint": "eslint src/**/*.ts",
-    "package": "ncc build --source-map --license licenses.txt && npm run _copy-files-dist",
+    "package": "ncc build --license licenses.txt && npm run _copy-files-dist",
     "test": "jest",
     "all": "npm run build && npm run format && npm run lint && npm run package && npm test",
     "_copy-files-lib": "cp src/start-xvfb.bash lib/",

diff --git a/src/main.ts b/src/main.ts
@@ -74,7 +74,7 @@ async function startXvfb(env: { [key: string]: string }): Promise<string[]> {
   const options: exec.ExecOptions = { env: env };
   const output: exec.ExecOutput = await exec.getExecOutput(
     "bash",
-    [`${__dirname}/start-xvfb.bash`],
+    [`${__dirname}/start-xvfb.bash`, core.getInput("xvfb-screen-size")],
     options
   );
   if (output.exitCode == 0) {
@@ -135,8 +135,8 @@ async function main() {
 
     if (process.platform == "linux") {
       await installDeps(env);
-      const [pid, display] = await startXvfb(env);
-      console.log(`xvfb pid=${pid}, display=${display}`);
+      const [pid, display, screen] = await startXvfb(env);
+      console.log(`xvfb pid=${pid}, display=${display}, screen=${screen}`);
       env.DISPLAY = `:${display}`;
       await linuxSetup(env);
     }

diff --git a/src/start-xvfb.bash b/src/start-xvfb.bash
@@ -21,9 +21,10 @@ find_free_servernum() {
 }
 
 SERVERNUM=$(find_free_servernum)
+SCREEN_SIZE=${1:-"1280x1024x24"}
 
-# TODO: allow configuration of screen
-Xvfb :$SERVERNUM -screen 0, 1024x768x16 > /tmp/xvfb-output 2>&1 &
+Xvfb :"$SERVERNUM" -screen 0 "$SCREEN_SIZE" > /tmp/xvfb-output 2>&1 &
 
 echo "$!"
 echo "$SERVERNUM"
+echo "$SCREEN_SIZE"