Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
jurplel committed Mar 6, 2020
2 parents 0360765 + 16e93bc commit 4fe5135
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,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.8a2`
Default: `==0.8a4`

### `py7zrversion`
Version of py7zr in the same style as the aqtversion and intended to be used for the same purpose.

Default: `==0.6b6`
Default: `==0.6b8`

## Example with all arguments

Expand All @@ -125,8 +125,8 @@ Default: `==0.6b6`
modules: 'qtcharts qtwebengine'
mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
cached: 'false'
aqtversion: '==0.8a1'
py7zrversion: '==0.6b6'
aqtversion: '==0.8a4'
py7zrversion: '==0.6b8'
```

## More info
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.8a1'
default: '==0.8a4'
py7zrversion:
description: "Version of py7zr to use in case of issues"
default: '==0.6b6'
default: '==0.6b8'

runs:
using: 'node12'
Expand Down

0 comments on commit 4fe5135

Please sign in to comment.