From e7378cedbcab8fb5a0d3607e457269e3f33b197f Mon Sep 17 00:00:00 2001 From: LorenzE Date: Sun, 24 Nov 2019 14:26:45 -0500 Subject: [PATCH 1/5] Add support for qt modules --- README.md | 4 +++- src/main.ts | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 72e5de8c..a8beceac 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ Possible values: `windows`, `mac`, or `linux` Defaults to the current platform it is being run on. - ### `target` This is the target platform that you will be building for. You will want to set this if you are building for iOS or Android. @@ -65,6 +64,9 @@ Whether or not to automatically install Qt dependencies on Linux (you probably w Default: `true` +### `module` +Additional Qt modules can be added via, e.g., `--module qtcharts`. + ## More info The Qt bin directory is added to your `path` environment variable. `Qt5_Dir` is also set appropriately for cmake. diff --git a/src/main.ts b/src/main.ts index e9ac4f51..2b698c72 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,13 +17,14 @@ async function run() { } await exec.exec("pip3 install setuptools wheel"); - await exec.exec("pip3 install \"aqtinstall==0.5.*\""); + await exec.exec("pip3 install aqtinstall --pre"); const dir = (core.getInput("dir") || process.env.RUNNER_WORKSPACE) + "/Qt"; const version = core.getInput("version"); let host = core.getInput("host"); let target = core.getInput("target"); let arch = core.getInput("arch"); + let module = core.getInput("module"); //set host automatically if omitted if (!host) { @@ -57,6 +58,9 @@ async function run() { if (arch) { args.push(`${arch}`); } + if (module) { + args.push(`--module ${module}`); + } //accomodate for differences in python 3 executable name let pythonName = "python3"; From b9641307b43768b611c345079f4d25f37cdf962d Mon Sep 17 00:00:00 2001 From: LorenzE Date: Sun, 24 Nov 2019 14:30:00 -0500 Subject: [PATCH 2/5] Add PR support for tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a3444350..d0bb78b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: Test Installing Qt -on: [push] +on: [push, pull_request] jobs: test: From 0a65293dc5bd089e9cd201404a24062d95ff6cc7 Mon Sep 17 00:00:00 2001 From: Benjamin O Date: Sun, 24 Nov 2019 18:28:55 -0500 Subject: [PATCH 3/5] Add in action.yml --- action.yml | 3 ++- src/main.ts | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/action.yml b/action.yml index 3b42dd37..cc1e7508 100644 --- a/action.yml +++ b/action.yml @@ -20,7 +20,8 @@ inputs: install-deps: description: 'Whether or not to install Qt dependencies on Linux' default: 'true' - + modules: + description: 'Additional Qt modules to install' runs: using: 'node12' main: 'lib/main.js' diff --git a/src/main.ts b/src/main.ts index 2b698c72..e5aed143 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,14 +17,14 @@ async function run() { } await exec.exec("pip3 install setuptools wheel"); - await exec.exec("pip3 install aqtinstall --pre"); + await exec.exec("pip3 install \"aqtinstall==0.6.*\" --pre"); const dir = (core.getInput("dir") || process.env.RUNNER_WORKSPACE) + "/Qt"; const version = core.getInput("version"); let host = core.getInput("host"); let target = core.getInput("target"); let arch = core.getInput("arch"); - let module = core.getInput("module"); + let modules = core.getInput("modules"); //set host automatically if omitted if (!host) { @@ -58,8 +58,8 @@ async function run() { if (arch) { args.push(`${arch}`); } - if (module) { - args.push(`--module ${module}`); + if (modules) { + args.push(`-m ${modules}`); } //accomodate for differences in python 3 executable name From 4955c08a6f29fd3db0eed2370328e8e177aa8163 Mon Sep 17 00:00:00 2001 From: Benjamin O Date: Sun, 24 Nov 2019 18:51:09 -0500 Subject: [PATCH 4/5] update documentation --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a8beceac..88f1324c 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,13 @@ Whether or not to automatically install Qt dependencies on Linux (you probably w Default: `true` -### `module` -Additional Qt modules can be added via, e.g., `--module qtcharts`. +### `modules` +List of additional addon modules to install, with each entry seperated by a space. If you need one of these, you'll know it. + +Possible values: `qtcharts`, `qtdatavis3d`, `qtpurchasing`, `qtvirtualkeyboard`, `qtwebengine`, `qtnetworkauth`, `qtwebglplugin`, `qtscript`, `debug_info`, possibly others + +Default: none + ## More info From a232f100b3b481edf0b88dcf1a563ed16faaecb7 Mon Sep 17 00:00:00 2001 From: Benjamin O Date: Fri, 6 Dec 2019 20:33:57 -0500 Subject: [PATCH 5/5] removed --pre --- src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.ts b/src/main.ts index e5aed143..ea69487f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,7 +17,7 @@ async function run() { } await exec.exec("pip3 install setuptools wheel"); - await exec.exec("pip3 install \"aqtinstall==0.6.*\" --pre"); + await exec.exec("pip3 install \"aqtinstall==0.6.*\""); const dir = (core.getInput("dir") || process.env.RUNNER_WORKSPACE) + "/Qt"; const version = core.getInput("version");