improve input parsing

Author: Skycoder42

action.yml

@@ -1,45 +1,51 @@
-name: 'Setup Qt environment'
-description: 'Setup Qt by using the prebuilt binaries the Qt-Company provides'
-author: 'Skycoder42'
-inputs: 
- version:
- description: 'The Qt version to download and install. Example: 5.13.1'
- required: true
- platform:
- description: 'A version dependend platform package to be installed. Example: gcc_64'
- required: true
- packages:
- description: 'A comma seperated list of additional packages to be installed. Example: qtnetworkauth,qtwebengine,qt.tools.ifw.32'
- required: false
- default: ''
- deep-sources:
- description: 'A space seperated list of additional URLs to download modules from. Modules should be layed out as "<url>/<os>_<arch>/<type>/qt5_qt<version>/<module>"'
- required: false
- default: ''
- flat-sources:
- description: 'A space seperated list of additional URLs to download modules from. Modules should be layed out as "<url>/<os>_<arch>/qt<version>/<module>"'
- required: false
- default: ''
- clean:
- description: 'Perform a clean installation, ignoring any caches'
- required: false
- default: 'false'
-outputs:
- shell:
- description: 'The shell that should be used to run qmake/make commands'
- make:
- description: 'Name of the "make" executable to be used, i.e. name, nmake or mingw32-make'
- tests:
- description: 'Set to true if tests should be run, false otherwise'
- testflags:
- description: 'makeflags to be used when running tests'
- qtdir:
- description: 'The path where qt was installed'
- installdir:
- description: 'The path to install stuff to before packing them as artifact'
- outdir:
- description: 'The path where installed files go after installing to installdir'
-runs:
- using: 'node12'
- main: 'lib/setup-qt.js'
-
+name: "Setup Qt environment"
+description: "Setup Qt by using the prebuilt binaries the Qt-Company provides"
+author: "Skycoder42"
+inputs:
+ version:
+ description: "The Qt version to download and install. Example: 5.13.1"
+ required: true
+ platform:
+ description: "A version dependend platform package to be installed. Example: gcc_64"
+ required: true
+ packages:
+ description: "A comma seperated list of additional packages to be installed. Example: qtnetworkauth,qtwebengine,qt.tools.ifw.32"
+ required: false
+ default: ""
+ deep-sources:
+ description: 'A space seperated list of additional URLs to download modules from. Modules should be layed out as "<url>/<os>_<arch>/<type>/qt5_qt<version>/<module>"'
+ required: false
+ default: ""
+ flat-sources:
+ description: 'A space seperated list of additional URLs to download modules from. Modules should be layed out as "<url>/<os>_<arch>/qt<version>/<module>"'
+ required: false
+ default: ""
+ cache-mode:
+ description: 'Specify the cache mode. Must be one of "default", "none", "post"'
+ required: false
+ default: "default"
+ clean:
+ description: "Perform a clean installation, ignoring any caches"
+ required: false
+ default: "false"
+outputs:
+ shell:
+ description: "The shell that should be used to run qmake/make commands"
+ make:
+ description: 'Name of the "make" executable to be used, i.e. name, nmake or mingw32-make'
+ tests:
+ description: "Set to true if tests should be run, false otherwise"
+ testflags:
+ description: "makeflags to be used when running tests"
+ qtdir:
+ description: "The path where qt was installed"
+ installdir:
+ description: "The path to install stuff to before packing them as artifact"
+ outdir:
+ description: "The path where installed files go after installing to installdir"
+runs:
+ using: "node12"
+ main: "lib/main.js"
+# post: 'lib/post.js'
+# post-if: 'success()'
+

lib/installer.js

@@ -27,13 +27,12 @@ const mingwplatform_1 = __importDefault(require("./platforms/mingwplatform"));
 const msvcplatform_1 = __importDefault(require("./platforms/msvcplatform"));
 const macosplatform_1 = __importDefault(require("./platforms/macosplatform"));
 const downloader_1 = __importDefault(require("./downloader"));
-const versionnumber_1 = __importDefault(require("./versionnumber"));
 const exists = util_1.promisify(fs_1.exists);
 let Installer = /** @class */ (() => {
  class Installer {
  constructor(version, platform) {
  this._tempDir = this.initTempDir(os_1.platform());
- this._version = versionnumber_1.default.fromString(version);
+ this._version = version;
  let host;
  let arch;
  switch (os_1.platform()) {
@@ -72,18 +71,19 @@ let Installer = /** @class */ (() => {
  yield this._platform.runPreInstall();
  // try to get Qt from cache, unless clean is specified
  let toolPath = null;
- if (clean != "true") {
+ if (!clean) {
  core_1.debug(`Trying to restore Qt from cache with key: ${this._cacheKey} `);
  const hitKey = yield cache_1.restoreCache([Installer.CacheDir], this._cacheKey);
- if (hitKey && (yield exists(path_1.join(Installer.CacheDir, "bin", this._platform.qmakeName())))) {
+ if (hitKey &&
+ (yield exists(path_1.join(Installer.CacheDir, "bin", this._platform.qmakeName())))) {
  toolPath = path_1.resolve(Installer.CacheDir);
  core_1.debug(`Restored Qt from cache to path: ${toolPath}`);
  }
  }
  // download, extract, cache
  if (!toolPath) {
- core_1.debug('Downloading and installing Qt');
- toolPath = yield this.acquireQt(this.parseList(packages, ','), this.parseList(deepSrc, ' '), this.parseList(flatSrc, ' '));
+ core_1.debug("Downloading and installing Qt");
+ toolPath = yield this.acquireQt(packages, deepSrc, flatSrc);
  core_1.debug(`Caching Qt with key: ${this._cacheKey}`);
  yield this._platform.runPostInstall(false, toolPath);
  try {
@@ -95,7 +95,7 @@ let Installer = /** @class */ (() => {
  }
  else
  yield this._platform.runPostInstall(true, toolPath);
- core_1.info('Using Qt installation: ' + toolPath);
+ core_1.info("Using Qt installation: " + toolPath);
  // generate qdep prf
  yield this.generateQdepPrf(toolPath);
  // update output / env vars
@@ -114,40 +114,34 @@ let Installer = /** @class */ (() => {
  const iPath = this._platform.installDirs(toolPath);
  yield io_1.mkdirP(iPath[0]);
  const instPath = path_1.join(iPath[0], os_1.platform() == "win32" ? toolPath.substr(3) : toolPath.substr(1), "..", "..");
- core_1.setOutput('outdir', instPath);
- core_1.setOutput('installdir', iPath[1]);
+ core_1.setOutput("outdir", instPath);
+ core_1.setOutput("installdir", iPath[1]);
  });
  }
- parseList(list, seperator) {
- return list
- .split(seperator)
- .map(e => e.trim())
- .filter(e => e.length > 0);
- }
  initTempDir(platform) {
- let tempDirectory = process.env['RUNNER_TEMP'] || '';
+ let tempDirectory = process.env["RUNNER_TEMP"] || "";
  if (!tempDirectory) {
  let baseLocation;
  if (platform == "win32") {
  // On windows use the USERPROFILE env variable
- baseLocation = process.env['USERPROFILE'] || 'C:\\';
+ baseLocation = process.env["USERPROFILE"] || "C:\\";
  }
  else {
- if (platform === 'darwin')
- baseLocation = '/Users';
+ if (platform === "darwin")
+ baseLocation = "/Users";
  else
- baseLocation = '/home';
+ baseLocation = "/home";
  }
- tempDirectory = path_1.join(baseLocation, 'actions', 'temp');
+ tempDirectory = path_1.join(baseLocation, "actions", "temp");
  }
  return tempDirectory;
  }
  installQdep() {
  return __awaiter(this, void 0, void 0, function* () {
- const pythonPath = yield io_1.which('python', true);
+ const pythonPath = yield io_1.which("python", true);
  core_1.debug(`Using python: ${pythonPath}`);
  yield exec_1.exec(pythonPath, ["-m", "pip", "install", "qdep"]);
- const qdepPath = yield io_1.which('qdep', true);
+ const qdepPath = yield io_1.which("qdep", true);
  yield exec_1.exec(qdepPath, ["--version"]);
  core_1.info("Installed qdep");
  });
@@ -167,7 +161,7 @@ let Installer = /** @class */ (() => {
  for (const pkg of packages)
  this._downloader.addDownload(pkg, true);
  // download and install
- const installPath = path_1.join(this._tempDir, 'qt');
+ const installPath = path_1.join(this._tempDir, "qt");
  yield this._downloader.installTo(installPath);
  const dataPath = path_1.join(installPath, this._version.toString(), this._platform.platform);
  // move tools
@@ -186,7 +180,7 @@ let Installer = /** @class */ (() => {
  return __awaiter(this, void 0, void 0, function* () {
  // add qdep prf file
  const qmakePath = path_1.join(installPath, "bin", this._platform.qmakeName());
- const qdepPath = yield io_1.which('qdep', true);
+ const qdepPath = yield io_1.which("qdep", true);
  yield exec_1.exec(qdepPath, ["prfgen", "--qmake", qmakePath]);
  core_1.info("Successfully prepared qdep");
  });

lib/setup-qt.js lib/main.jslib/setup-qt.js renamed to lib/main.js

@@ -14,11 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@actions/core");
 const installer_1 = __importDefault(require("./installer"));
+const options_1 = require("./options");
 function run() {
  return __awaiter(this, void 0, void 0, function* () {
  try {
- const installer = new installer_1.default(core_1.getInput('version'), core_1.getInput('platform'));
- yield installer.getQt(core_1.getInput('packages'), core_1.getInput('deep-sources'), core_1.getInput('flat-sources'), core_1.getInput('clean'));
+ const installer = new installer_1.default(options_1.getParam("version" /* Version */), options_1.getParam("platform" /* Platform */));
+ yield installer.getQt(options_1.getParam("packages" /* Packages */), options_1.getParam("deep-sources" /* DeepSources */), options_1.getParam("flat-sources" /* FlatSources */), options_1.getParam("clean" /* Clean */));
  }
  catch (e) {
  console.error(e);

lib/options.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+ return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getParam = void 0;
+const core_1 = require("@actions/core");
+const versionnumber_1 = __importDefault(require("./versionnumber"));
+const parseList = (list, seperator) => list
+ .split(seperator)
+ .map((e) => e.trim())
+ .filter((e) => e.length > 0);
+const parsers = {
+ ["version" /* Version */]: (v) => versionnumber_1.default.fromString(v),
+ ["platform" /* Platform */]: (v) => v,
+ ["packages" /* Packages */]: (v) => parseList(v, ","),
+ ["deep-sources" /* DeepSources */]: (v) => parseList(v, " "),
+ ["flat-sources" /* FlatSources */]: (v) => parseList(v, " "),
+ ["cache-mode" /* CacheMode */]: (v) => v,
+ ["clean" /* Clean */]: (v) => v === "true",
+};
+const getParser = (key) => {
+ return parsers[key];
+};
+exports.getParam = (key, defaultValue) => {
+ const input = core_1.getInput(key, { required: !defaultValue });
+ return getParser(key)(input);
+};

lib/post.js

@@ -0,0 +1 @@
+"use strict";