Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug: fix error when instaling win64_llvm_mingw / Qt 6.7 and 6.8 #826

Merged
merged 8 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aqt/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ def dir_for_version(ver: Version) -> str:

@staticmethod
def get_arch_dir_name(host: str, arch: str, version: Version) -> str:
if arch.startswith("win64_mingw"):
if arch.startswith("win64") and arch.endswith("mingw"):
return arch[6:] + "_64"
miurahr marked this conversation as resolved.
Show resolved Hide resolved
elif arch.startswith("win32_mingw"):
return arch[6:] + "_32"
Expand Down
2 changes: 1 addition & 1 deletion aqt/updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def make_qtenv2(self, base_dir, qt_version, arch_dir):
f.write("echo Remember to call vcvarsall.bat to complete environment setup!\n")

def set_license(self, base_dir: str, qt_version: str, arch_dir: str):
"""Update qtconfig.pri as OpenSource"""
"""Update qconfig.pri as OpenSource"""
with open(os.path.join(base_dir, qt_version, arch_dir, "mkspecs", "qconfig.pri"), "r+") as f:
lines = f.readlines()
f.seek(0)
Expand Down
9 changes: 9 additions & 0 deletions ci/generate_azure_pipelines_matrices.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ def __init__(self, platform, build_jobs):
"desktop",
"win64_msvc2019_arm64",
"msvc2019_arm64",
is_autodesktop=True, # Should install win64_msvc2019_arm64 in parallel
),
BuildJob(
"install-qt",
"6.7.3",
"windows",
"desktop",
"win64_llvm_mingw",
"llvm_mingw",
miurahr marked this conversation as resolved.
Show resolved Hide resolved
is_autodesktop=True, # Should install win64_msvc2019_arm64 in parallel
miurahr marked this conversation as resolved.
Show resolved Hide resolved
miurahr marked this conversation as resolved.
Show resolved Hide resolved
),
BuildJob(
Expand Down
Loading