From 2319dad2eb2e64d5e2e46c7879327826df738692 Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Thu, 27 Aug 2020 07:02:46 +0200 Subject: [PATCH 1/4] Mention win64_mingw81 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b29e4aa6..cd169c5b 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ This is the target architecture that your program will be built for. This is onl **Possible values:** -Windows: `win64_msvc2017_64`, `win64_msvc2015_64`, `win32_msvc2015`, `win32_mingw53`, or `win64_mingw73` +Windows: `win64_msvc2017_64`, `win64_msvc2015_64`, `win32_msvc2015`, `win32_mingw53`, `win64_mingw73` or `win64_mingw81` Android: `android_x86`, `android_armv7` From b93c44bf788035175caaaec42d483f1aaf4b11e3 Mon Sep 17 00:00:00 2001 From: Benjamin O Date: Fri, 28 Aug 2020 10:29:20 -0400 Subject: [PATCH 2/4] Add updates.xml to readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index cd169c5b..bdc091b2 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,9 @@ Windows: `win64_msvc2017_64`, `win64_msvc2015_64`, `win32_msvc2015`, `win32_ming Android: `android_x86`, `android_armv7` +You can find a full list of architectures by checking the Updates.xml for your version/platform. +For Qt 5.12.9 on windows: https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5129/Updates.xml + **Default values:** Windows w/ Qt < 5.6: `win64_msvc2013_64` From 9536a305e1e66c8eed3f8b9171cf4d0aed0b7e3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2020 17:19:03 +0000 Subject: [PATCH 3/4] Bump @actions/core from 1.0.0 to 1.2.6 Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.0.0 to 1.2.6. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core) Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 072d1251..5b978a8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@actions/core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.0.0.tgz", - "integrity": "sha512-aMIlkx96XH4E/2YZtEOeyrYQfhlas9jIRkfGPqMwXD095Rdkzo4lB6ZmbxPQSzD+e1M+Xsm98ZhuSMYGv/AlqA==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz", + "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==" }, "@actions/exec": { "version": "1.0.1", @@ -34,6 +34,11 @@ "concat-map": "0.0.1" } }, + "compare-versions": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz", + "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -92,11 +97,6 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, - "compare-versions": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz", - "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==" - }, "typescript": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", diff --git a/package.json b/package.json index d6546908..1e7cab92 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "author": "jurplel", "license": "MIT", "dependencies": { - "@actions/core": "^1.0.0", + "@actions/core": "^1.2.6", "@actions/exec": "^1.0.0", "glob": "^7.0.0", "compare-versions": "^3.6.0" From 44606fb3429ca645da8b6ca674e9b6bbefb039b8 Mon Sep 17 00:00:00 2001 From: Benjamin O Date: Mon, 5 Oct 2020 08:55:58 -0400 Subject: [PATCH 4/4] Update aqtinstall version --- README.md | 8 ++++---- action.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bdc091b2..66f5c734 100644 --- a/README.md +++ b/README.md @@ -112,12 +112,12 @@ 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.9.4` +Default: `==0.9.7` ### `py7zrversion` Version of py7zr in the same style as the aqtversion and intended to be used for the same purpose. -Default: `==0.9.1` +Default: `==0.10.1` ### `extra` This input can be used to append arguments to the end of the aqtinstall command in case of special needs. @@ -139,8 +139,8 @@ Example value: `--external 7z` modules: 'qtcharts qtwebengine' mirror: 'http://mirrors.ocf.berkeley.edu/qt/' cached: 'false' - aqtversion: '==0.9.4' - py7zrversion: '==0.9.1' + aqtversion: '==0.9.7' + py7zrversion: '==0.10.1' extra: '--external 7z' ``` diff --git a/action.yml b/action.yml index c9c3d252..d8a7076a 100644 --- a/action.yml +++ b/action.yml @@ -29,10 +29,10 @@ inputs: default: 'false' aqtversion: description: "Version of aqtinstall to use in case of issues" - default: '==0.9.4' + default: '==0.9.7' py7zrversion: description: "Version of py7zr to use in case of issues" - default: '==0.9.1' + default: '==0.10.1' extra: description: "Any extra arguments to append to the back" runs: