Merge branch 'master' into v2

jurplel · Jan 21, 2020 · c558faf · c558faf
2 parents cac5c74 + 30ce7db
commit c558faf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,4 +42,3 @@ jobs:
           ls $Qt5_Dir/lib/cmake
           qmake
         shell: bash
-
diff --git a/src/main.ts b/src/main.ts
@@ -13,11 +13,12 @@ async function run() {
     // Qt installer assumes basic requirements that are not installed by
     // default on Ubuntu.
     if (process.platform == "linux" && core.getInput("install-deps") == "true") {
+      await exec.exec("sudo apt-get update")
       await exec.exec("sudo apt-get install build-essential libgl1-mesa-dev -y")
     }
 
     await exec.exec("pip3 install setuptools wheel");
-    await exec.exec("pip3 install \"aqtinstall==0.6.*\"");
+    await exec.exec("pip3 install \"aqtinstall==0.7.*\"");
 
     const dir = (core.getInput("dir") || process.env.RUNNER_WORKSPACE) + "/Qt";
     const version = core.getInput("version");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,3 @@ jobs:
		ls $Qt5_Dir/lib/cmake
		qmake
		shell: bash