Skip to content

Commit

Permalink
Use my aqt fork by default
Browse files Browse the repository at this point in the history
  • Loading branch information
jdpurcell committed Dec 14, 2024
1 parent 2b3ad1c commit efd0e30
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion action/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,12 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
if (inputs.aqtSource.length > 0) {
yield execPython("pip install", [`"${inputs.aqtSource}"`]);
}
else {
else if (inputs.aqtVersion.length > 0) {
yield execPython("pip install", [`"aqtinstall${inputs.aqtVersion}"`]);
}
else {
yield execPython("pip install", ["git+https://github.com/jdpurcell/aqtinstall.git@v3.1.999"]);
}
// This flag will install a parallel desktop version of Qt, only where required.
// aqtinstall will automatically determine if this is necessary.
const autodesktop = (yield isAutodesktopSupported()) ? ["--autodesktop"] : [];
Expand Down
4 changes: 3 additions & 1 deletion action/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,10 @@ const run = async (): Promise<void> => {
// Install aqtinstall separately: allows aqtinstall to override py7zr if required
if (inputs.aqtSource.length > 0) {
await execPython("pip install", [`"${inputs.aqtSource}"`]);
} else {
} else if (inputs.aqtVersion.length > 0) {
await execPython("pip install", [`"aqtinstall${inputs.aqtVersion}"`]);
} else {
await execPython("pip install", ["git+https://github.com/jdpurcell/aqtinstall.git@v3.1.999"]);
}

// This flag will install a parallel desktop version of Qt, only where required.
Expand Down

0 comments on commit efd0e30

Please sign in to comment.