Skip to content

Commit

Permalink
Use latest jom for test
Browse files Browse the repository at this point in the history
  • Loading branch information
@xavier2k6
xavier2k6 committed Feb 20, 2025
1 parent a30f5a3 commit 8633439
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions ci/generate_azure_pipelines_matrices.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ def __init__(self, platform, build_jobs):
"6.5.3",
"windows",
"desktop",
"win64_msvc2019_arm64",
"msvc2019_arm64",
is_autodesktop=True, # Should install win64_msvc2019_arm64 in parallel
"win64_msvc2022_arm64",
"msvc2022_arm64",
is_autodesktop=True, # Should install win64_msvc2022_arm64 in parallel
),
BuildJob(
"install-qt",
Expand Down
Binary file removed ci/jom_1_1_3.zip
View file
Binary file not shown.
Binary file added ci/jom_1_1_4.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ci/steps.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ steps:
Write-Host '##vso[task.setvariable variable=VSVER]2022'
}
cd $(WIN_QT_BINDIR)
unzip $(Build.SourcesDirectory)\ci\jom_1_1_3.zip
unzip $(Build.SourcesDirectory)\ci\jom_1_1_4.zip
condition: |
and(eq(variables['Agent.OS'], 'Windows_NT'),
eq(variables['SUBCOMMAND'], 'install-qt'))
Expand Down
26 changes: 13 additions & 13 deletions tests/test_install.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,21 +783,21 @@ def tool_archive(host: str, tool_name: str, variant: str, date: datetime = datet
),
# --autodesktop test edited
(
"install-qt windows desktop 6.5.2 win64_msvc2019_arm64 --autodesktop".split(),
"install-qt windows desktop 6.5.3 win64_msvc2019_arm64 --autodesktop".split(),
"windows",
"desktop",
"6.5.2",
"6.5.3",
{"std": "win64_msvc2019_arm64", "desk": "win64_msvc2019_64"},
{"std": "msvc2019_arm64", "desk": "msvc2019_64"},
{
"std": "windows_x86/desktop/qt6_652/Updates.xml",
"desk": "windows_x86/desktop/qt6_652/Updates.xml",
"std": "windows_x86/desktop/qt6_653/Updates.xml",
"desk": "windows_x86/desktop/qt6_653/Updates.xml",
},
{
"std": [
MockArchive(
filename_7z="qtbase-windows-win64_msvc2019_arm64.7z",
update_xml_name="qt.qt6.652.win64_msvc2019_arm64",
update_xml_name="qt.qt6.653.win64_msvc2019_arm64",
contents=(
# Qt 6 msvc-arm64 should patch qconfig.pri, qmake script and target_qt.conf
PatchedFile(
Expand All @@ -816,7 +816,7 @@ def tool_archive(host: str, tool_name: str, variant: str, date: datetime = datet
unpatched_content="Prefix=/Users/qt/work/install/target\n"
"HostPrefix=../../\n"
"HostData=target\n",
patched_content="Prefix={base_dir}{sep}6.5.2{sep}msvc2019_arm64{sep}target\n"
patched_content="Prefix={base_dir}{sep}6.5.3{sep}msvc2019_arm64{sep}target\n"
"HostPrefix=../../msvc2019_64\n"
"HostData=../msvc2019_arm64\n",
),
Expand All @@ -826,7 +826,7 @@ def tool_archive(host: str, tool_name: str, variant: str, date: datetime = datet
"/Users/qt/work/install/bin\n"
"... blah blah blah ...\n",
patched_content="... blah blah blah ...\n"
"{base_dir}\\6.5.2\\msvc2019_64\\bin\n"
"{base_dir}\\6.5.3\\msvc2019_64\\bin\n"
"... blah blah blah ...\n",
),
PatchedFile(
Expand All @@ -835,7 +835,7 @@ def tool_archive(host: str, tool_name: str, variant: str, date: datetime = datet
"/Users/qt/work/install/bin\n"
"... blah blah blah ...\n",
patched_content="... blah blah blah ...\n"
"{base_dir}\\6.5.2\\msvc2019_64\\bin\n"
"{base_dir}\\6.5.3\\msvc2019_64\\bin\n"
"... blah blah blah ...\n",
),
PatchedFile(
Expand All @@ -844,7 +844,7 @@ def tool_archive(host: str, tool_name: str, variant: str, date: datetime = datet
"/Users/qt/work/install/bin\n"
"... blah blah blah ...\n",
patched_content="... blah blah blah ...\n"
"{base_dir}\\6.5.2\\msvc2019_64\\bin\n"
"{base_dir}\\6.5.3\\msvc2019_64\\bin\n"
"... blah blah blah ...\n",
),
PatchedFile(
Expand All @@ -853,22 +853,22 @@ def tool_archive(host: str, tool_name: str, variant: str, date: datetime = datet
"/Users/qt/work/install/bin\n"
"... blah blah blah ...\n",
patched_content="... blah blah blah ...\n"
"{base_dir}\\6.5.2\\msvc2019_64\\bin\n"
"{base_dir}\\6.5.3\\msvc2019_64\\bin\n"
"... blah blah blah ...\n",
),
),
),
],
"desk": [plain_qtbase_archive("qt.qt6.652.win64_msvc2019_64", "win64_msvc2019_64", host="windows")],
"desk": [plain_qtbase_archive("qt.qt6.653.win64_msvc2019_64", "win64_msvc2019_64", host="windows")],
},
re.compile(
r"^INFO : aqtinstall\(aqt\) v.* on Python 3.*\n"
r"INFO : You are installing the MSVC Arm64 version of Qt\n"
r"INFO : Downloading qtbase...\n"
r"(?:.*\n)*?"
r"(INFO : Patching .*?[/\\]6\.5\.2[/\\]msvc2019_arm64[/\\]bin[/\\](?:qmake|qtpaths)(?:6)?\.bat\n)*"
r"(INFO : Patching .*?[/\\]6\.5\.3[/\\]msvc2019_arm64[/\\]bin[/\\](?:qmake|qtpaths)(?:6)?\.bat\n)*"
r"INFO : \n"
r"INFO : Autodesktop will now install windows desktop 6\.5\.2 "
r"INFO : Autodesktop will now install windows desktop 6\.5\.3 "
r"win64_msvc2019_64 as required by MSVC Arm64\n"
r"INFO : aqtinstall\(aqt\) v.* on Python 3.*\n"
r"INFO : Downloading qtbase...\n"
Expand Down

0 comments on commit 8633439

Please sign in to comment.