Skip to content

Commit

Permalink
Merge pull request #665 from ddalcino/topic/fix-failed-install-zipfiles
Browse files Browse the repository at this point in the history
Fix failure to install Qt 6.4.3 source and docs on Windows
  • Loading branch information
miurahr authored Mar 30, 2023
2 parents 4964411 + 08733af commit 031ae09
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions aqt/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import sys
import tarfile
import time
import zipfile
from logging import getLogger
from logging.handlers import QueueHandler
from pathlib import Path
Expand Down Expand Up @@ -1226,6 +1227,9 @@ def download_bin(_base_url):
if tarfile.is_tarfile(archive):
with tarfile.open(archive) as tar_archive:
tar_archive.extractall(path=base_dir)
elif zipfile.is_zipfile(archive):
with zipfile.ZipFile(archive) as zip_archive:
zip_archive.extractall(path=base_dir)
elif command is None:
with py7zr.SevenZipFile(archive, "r") as szf:
szf.extractall(path=base_dir)
Expand Down
6 changes: 6 additions & 0 deletions ci/generate_azure_pipelines_matrices.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@ def __init__(self, platform, build_jobs):
spec=">1,<5.15", # Don't redirect output! Must be wrapped in quotes!
mirror=random.choice(MIRRORS),
),
BuildJob(
# Archives stored as .zip
"install-src", "6.4.3", "windows", "desktop", "gcc_64", "gcc_64", subarchives="qtlottie",
# Fail the job if this path does not exist:
check_output_cmd="ls -lh ./6.4.3/Src/qtlottie/",
),
]
)

Expand Down

0 comments on commit 031ae09

Please sign in to comment.