From 5dad9c9718559b06971e79db7b913f8a3e09ca8b Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Mon, 4 May 2020 11:35:26 +0900 Subject: [PATCH] AP: mingw81 test which is in Azure hosted image Signed-off-by: Hiroshi Miura --- ci/generate_azure_pipelines_matrices.py | 4 ++-- ci/steps.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/generate_azure_pipelines_matrices.py b/ci/generate_azure_pipelines_matrices.py index d8dfa43..7897d3f 100644 --- a/ci/generate_azure_pipelines_matrices.py +++ b/ci/generate_azure_pipelines_matrices.py @@ -64,8 +64,8 @@ windows_build_jobs.extend( BuildJob('5.14.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'), BuildJob('5.14.2', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'), BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'), - BuildJob('5.13.2', 'windows', 'desktop', 'win64_mingw73', 'mingw73_64'), - BuildJob('5.13.2', 'windows', 'desktop', 'win32_mingw73', 'mingw73_32'), + BuildJob('5.15.0', 'windows', 'desktop', 'win64_mingw81', 'mingw81_64'), + BuildJob('5.15.0', 'windows', 'desktop', 'win32_mingw81', 'mingw81_32'), BuildJob('5.15.0', 'windows', 'desktop', 'win64_msvc2019_64', 'msvc2019_64', module='qcharts qtnetworkauth'), ] ) diff --git a/ci/steps.yml b/ci/steps.yml index e33ac15..c48a5f0 100644 --- a/ci/steps.yml +++ b/ci/steps.yml @@ -146,14 +146,14 @@ steps: displayName: build test with qmake with MSVC w/o extra module - powershell: | choco uninstall -y mingw - python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) tools_mingw 7.3.0-1-202004170606 qt.tools.win64_mingw730 - [Environment]::SetEnvironmentVariable("Path", ";$(Build.BinariesDirectory)\Qt\Tools\mingw730_64\bin" + $env:Path, "Machine") + python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) tools_mingw 8.1.0-1-202004170606 qt.tools.win64_mingw810 + [Environment]::SetEnvironmentVariable("Path", ";$(Build.BinariesDirectory)\Qt\Tools\mingw810_64\bin" + $env:Path, "Machine") condition: and(eq( variables['Agent.OS'], 'Windows_NT'), eq(variables['TOOLCHAIN'], 'MINGW'), eq(variables['ARCH'], 'win64_mingw73')) displayName: Install Mingw73(win64) from Qt distribution and set PATH - powershell: | choco uninstall -y mingw - python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) tools_mingw 7.3.0-1-202004170606 qt.tools.win32_mingw730 - [Environment]::SetEnvironmentVariable("Path", ";$(Build.BinariesDirectory)\Qt\Tools\mingw730_32\bin" + $env:Path, "Machine") + python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) tools_mingw 8.1.0-1-202004170606 qt.tools.win32_mingw810 + [Environment]::SetEnvironmentVariable("Path", ";$(Build.BinariesDirectory)\Qt\Tools\mingw810_32\bin" + $env:Path, "Machine") condition: and(eq( variables['Agent.OS'], 'Windows_NT'), eq(variables['TOOLCHAIN'], 'MINGW'), eq(variables['ARCH'], 'win32_mingw73')) displayName: Install Mingw73(wine32) from Qt distribution and set PATH - powershell: |