Merge branch 'master' into v2

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15]
-        version: ['5.9', '5.15.1']
+        version: ['5.9.0', '5.15.1']
     steps:
       - uses: actions/checkout@v1
 
@@ -29,7 +29,7 @@ jobs:
         with:
           modules: 'qtwebengine'
           version: ${{ matrix.version }}
-          tools: 'tools_ifw,4.0,qt.tools.ifw.40'
+          tools: 'tools_ifw,4.0.0,qt.tools.ifw.40 tools_qtcreator,4.13.2-0,qt.tools.qtcreator'
 
       - name: Configure test project on windows
         if: startsWith(matrix.os, 'windows')

README.md

@@ -75,7 +75,7 @@ Can be set to `nosudo` to stop it from using sudo, for example on a docker conta
 Default: `true`
 
 ### `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.
+String with whitespace delimited 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
 
@@ -113,7 +113,7 @@ Default: `true`
 Qt "tools" to be installed. I would recommend looking at [aqtinstall](https://github.com/miurahr/aqtinstall)'s instructions for this, as it is an experimental feature.
 Specify the tool name, tool version, and arch separated by commas, and separate multiple tools with spaces.
 
-Example value: 'tools_ifw,4.0,qt.tools.ifw.40 tools_qtcreator,4.13.2-0,qt.tools.qtcreator'
+Example value: 'tools_ifw,4.0.0,qt.tools.ifw.40 tools_qtcreator,4.13.2-0,qt.tools.qtcreator'
 
 ### `set-env`
 Set this to false if you want to avoid setting environment variables for whatever reason.
@@ -130,12 +130,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: `==1.1.3`
+Default: `==1.2.5`
 
 ### `py7zrversion`
 Version of py7zr in the same style as the aqtversion and intended to be used for the same purpose.
 
-Default: `==0.14.0`
+Default: `==0.16.1`
 
 ### `extra`
 This input can be used to append arguments to the end of the aqtinstall command for any special purpose.
@@ -157,11 +157,11 @@ Example value: `--external 7z`
         modules: 'qtcharts qtwebengine'
         cached: 'false'
         setup-python: 'true'
-        tools: 'tools_ifw,4.0,qt.tools.ifw.40 tools_qtcreator,4.13.2-0,qt.tools.qtcreator'
+        tools: 'tools_ifw,4.0.0,qt.tools.ifw.40 tools_qtcreator,4.13.2-0,qt.tools.qtcreator'
         set-env: 'false'
         tools-only: 'false'
-        aqtversion: '==1.1.3'
-        py7zrversion: '==0.14.0'
+        aqtversion: '==1.2.5'
+        py7zrversion: '==0.16.1'
         extra: '--external 7z'
 ```
 

action.yml

@@ -38,10 +38,10 @@ inputs:
     default: 'false'
   aqtversion:
     description: "Version of aqtinstall to use in case of issues"
-    default: '==1.1.3'
+    default: '==1.2.5'
   py7zrversion:
     description: "Version of py7zr to use in case of issues"
-    default: '==0.14.0'
+    default: '==0.16.1'
   extra:
     description: "Any extra arguments to append to the back"
 runs:

src/main.ts

@@ -22,7 +22,7 @@ async function run() {
       // default on Ubuntu.
       if (process.platform == "linux") {
         let cmd0 = "apt-get update"
-        let cmd1 = "apt-get install build-essential libgl1-mesa-dev libxkbcommon-x11-0 libpulse-dev -y"
+        let cmd1 = "apt-get install build-essential libgl1-mesa-dev libxkbcommon-x11-0 libpulse-dev libxcb-util1 libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 -y"
         if (core.getInput("install-deps") == "true") {
             await exec.exec("sudo " + cmd0)
             await exec.exec("sudo " + cmd1)
@@ -124,6 +124,12 @@ async function run() {
       }
 
       //set environment variables
+
+      // Weird naming scheme exception for qt 5.9
+      if (version == '5.9.0') {
+        version = '5.9'
+      }
+
       let qtPath = dir + "/" + version;
       qtPath = glob.sync(qtPath + '/**/*')[0];
       if (setEnv == "true") {