diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1bdef66e..ea9f3e15 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: - name: Install Qt uses: ./ with: - modules: qtcharts qtwebengine + modules: 'qtcharts qtwebengine' - name: Configure test project on windows if: startsWith(matrix.os, 'windows') diff --git a/README.md b/README.md index d978da03..6b0adb7b 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,13 @@ Possible values: `qtcharts`, `qtdatavis3d`, `qtpurchasing`, `qtvirtualkeyboard`, Default: none +### `mirror` +Forces a different Qt mirror in case there is a problem with the default. + +If you have problems, you can try: `http://mirrors.ocf.berkeley.edu/qt/` + +Default: none + ### `cached` If it is set to `true`, then Qt won't be downloaded, but the environment variables will be set, and essential build tools will be installed. @@ -96,7 +103,7 @@ Default: `false` Version of [aqtinstall](https://github.com/miurahr/aqtinstall) to use, given in the format used by pip, for example: `==0.7.1`, `>=0.7.1`, `==0.7.*`. This is intended to be used to troubleshoot any bugs that might be caused or fixed by certain versions of aqtinstall. -Default: `==0.8a1` +Default: `==0.8a2` ### `py7zrversion` Version of py7zr in the same style as the aqtversion and intended to be used for the same purpose. @@ -116,6 +123,7 @@ Default: `==0.6b6` dir: '/example/' install-deps: 'true' modules: 'qtcharts qtwebengine' + mirror: 'http://mirrors.ocf.berkeley.edu/qt/' cached: 'false' aqtversion: '==0.8a1' py7zrversion: '==0.6b6' diff --git a/action.yml b/action.yml index 618f53fb..902bc437 100644 --- a/action.yml +++ b/action.yml @@ -22,6 +22,8 @@ inputs: default: 'true' modules: description: 'Additional Qt modules to install' + mirror: + description: 'Force a Qt mirror in case the default is not working' cached: description: "Whether or not to actually download Qt" default: 'false' diff --git a/src/main.ts b/src/main.ts index cbe54705..3cb5702d 100644 --- a/src/main.ts +++ b/src/main.ts @@ -28,6 +28,7 @@ async function run() { let target = core.getInput("target"); let arch = core.getInput("arch"); let modules = core.getInput("modules").split(" "); + let mirror = core.getInput("mirror"); //set host automatically if omitted if (!host) { @@ -63,10 +64,14 @@ async function run() { } if (modules) { args.push("-m"); - modules.forEach(function(currentValue) { - args.push(currentValue); + modules.forEach(function(currentModule) { + args.push(currentModule); }); } + if (mirror) { + args.push("-b"); + args.push(mirror); + } //accomodate for differences in python 3 executable name let pythonName = "python3";