Merge branch 'master' into v2

jurplel · Apr 17, 2020 · c6105df · c6105df
2 parents fd35d36 + 2d71bc3
commit c6105df
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,6 @@ jobs:
           modules: 'qtcharts qtwebengine'
           mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
           extra: '--external 7z'
-          arch: 'win64_mingw73'
 
       - name: Configure test project on windows
         if: startsWith(matrix.os, 'windows')

diff --git a/src/main.ts b/src/main.ts
@@ -4,9 +4,6 @@ import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 
 async function run() {
-  let tries = 0;
-  while (true)
-  {
     try {
       const dir = (core.getInput("dir") || process.env.RUNNER_WORKSPACE) + "/Qt";
       const version = core.getInput("version");
@@ -99,15 +96,9 @@ async function run() {
       core.exportVariable('Qt5_Dir', qtPath); // Incorrect name that was fixed, but kept around so it doesn't break anything
       core.exportVariable('Qt5_DIR', qtPath);
       core.addPath(qtPath + "/bin");
-      break;
     } catch (error) {
-      tries++;
-      if (tries >= 3) {
-        core.setFailed(error.message);
-        return;
-      }
+      core.setFailed(error.message);
     }
-  }
 }
 
 run();