diff --git a/lib/main.js b/lib/main.js index 7e67a16f..a7f929a6 100644 --- a/lib/main.js +++ b/lib/main.js @@ -26,8 +26,9 @@ function run() { if (process.platform == "darwin") { yield exec.exec("brew install p7zip"); } - yield exec.exec("pip3 install \"aqtinstall==0.4.*\""); - const dir = core.getInput("dir") || process.env.RUNNER_WORKSPACE; + yield exec.exec("pip3 install setuptools wheel"); + yield exec.exec("pip3 install \"aqtinstall==0.5.*\""); + const dir = (core.getInput("dir") || process.env.RUNNER_WORKSPACE) + "/Qt"; const version = core.getInput("version"); let host = core.getInput("host"); let target = core.getInput("target"); @@ -71,7 +72,7 @@ function run() { //run aqtinstall with args yield exec.exec(`${pythonName} -m aqt install`, args); //set environment variables - let qtPath = dir + "/Qt" + version + "/" + version; + let qtPath = dir + "/" + version; qtPath = glob.sync(qtPath + '/**/*')[0]; core.exportVariable('Qt5_Dir', qtPath); core.addPath(qtPath + "/bin");