Skip to content

Commit

Permalink
Merge branch 'master' into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
jurplel committed Oct 5, 2020
2 parents 77a08b2 + 44606fb commit b469fd6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ 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`

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`
Expand Down Expand Up @@ -109,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.
Expand All @@ -136,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'
```

Expand Down
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b469fd6

Please sign in to comment.