Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-17 12:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(ci): use install-qt subcommand

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2024-09-29 11:25:46 +09:00
parent 73fc45e12a
commit a90d93b02f
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/test-install-qt.yml vendored
View File

@@ -32,7 +32,7 @@ jobs:
py: "3.10" py: "3.10"
qtver: 6.1.0 qtver: 6.1.0
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
fetch-depth: 20 fetch-depth: 20
fetch-tags: true fetch-tags: true
@@ -88,24 +88,24 @@ jobs:
bin_path = str(github_workspace / "dist" / "aqt.exe") bin_path = str(github_workspace / "dist" / "aqt.exe")
else: else:
bin_path = (github_workspace / "dist" / "aqt").as_posix() bin_path = (github_workspace / "dist" / "aqt").as_posix()
prefix = [bin_path, "install"] prefix = [bin_path, "install-qt"]
else: else:
prefix = ["python", "-m", "aqt", "install"] prefix = ["python", "-m", "aqt", "install-qt"]
command_line = [] command_line = []
command_line.extend(prefix) command_line.extend(prefix)
if platform == "windows-latest": if platform == "windows-latest":
if qtver.startswith('5.15'): if qtver.startswith('5.15'):
args = [qtver, "windows", "desktop", "win64_msvc2019_64"] args = ["windows", "desktop", qtver, "win64_msvc2019_64"]
elif qtver.startswith('5.14'): elif qtver.startswith('5.14'):
args = [qtver, "windows", "desktop", "win64_msvc2017_64"] args = ["windows", "desktop", qtver, "win64_msvc2017_64"]
elif qtver.startswith('6'): elif qtver.startswith('6'):
args = [qtver, "windows", "desktop", "win64_mingw81"] args = ["windows", "desktop", qtver, "win64_mingw81"]
else: else:
args = [qtver, "windows", "desktop", "win64_msvc2015_64"] args = ["windows", "desktop", qtver, "win64_msvc2015_64"]
elif platform == "macOS-latest": elif platform == "macOS-latest":
args = [qtver, "mac", "desktop", "clang_64"] args = ["mac", "desktop", qtver, "clang_64"]
else: else:
args = [qtver, "linux", "desktop", "gcc_64"] args = ["linux", "desktop", qtver, "gcc_64"]
command_line.extend(args) command_line.extend(args)
command_line.extend(["--archives", "qtbase", "icu", "qt"]) command_line.extend(["--archives", "qtbase", "icu", "qt"])
env["AQT_CONFIG"] = (github_workspace / "ci" / "settings.ini").as_posix() env["AQT_CONFIG"] = (github_workspace / "ci" / "settings.ini").as_posix()
@@ -120,13 +120,13 @@ jobs:
command_line6 = [] command_line6 = []
command_line6.extend(prefix) command_line6.extend(prefix)
if platform.startswith("ubuntu"): if platform.startswith("ubuntu"):
command_line6.extend([qtver, "linux", "android", "android_armv7"]) command_line6.extend(["linux", "android", qtver, "android_armv7"])
timeout = 360 timeout = 360
elif platform.startswith("macOS"): elif platform.startswith("macOS"):
command_line6.extend([qtver, "mac", "ios", "ios"]) command_line6.extend(["mac", "ios", qtver, "ios"])
timeout = 360 timeout = 360
else: else:
command_line6.extend([qtver, "windows", "android", "android_armv7"]) command_line6.extend(["windows", "android", qtver, "android_armv7"])
timeout = 360 timeout = 360
print("Execute: {}".format(command_line6)) print("Execute: {}".format(command_line6))
try: try:
@@ -186,7 +186,7 @@ jobs:
print('PREFIX {}'.format(result)) print('PREFIX {}'.format(result))
shell: python shell: python
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
if: matrix.artifact == 'binary' if: matrix.artifact == 'binary'
with: with:
name: aqt-${{ matrix.os }}-standalone name: aqt-${{ matrix.os }}-standalone