diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 476f268..532b633 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -58,21 +58,6 @@ jobs: steps: - template: ci/steps.yml -- job: Mingw - displayName: Mingw73 on Windows - variables: - PYTHON_VERSION: '3.7' - QT_VERSION: 5.13.2 - HOST: windows - TARGET: desktop - ARCH: win64_mingw73 - ARCHDIR: mingw73_64 - EXTERNAL: 'C:\Program Files\7-Zip\7z.exe' - pool: - vmImage: 'vs2017-win2016' - steps: - - template: ci/steps.yml - - job: LinuxSpecificMirror displayName: Linux (Specific Mirror) variables: diff --git a/ci/steps.yml b/ci/steps.yml index 889c894..c20e54a 100644 --- a/ci/steps.yml +++ b/ci/steps.yml @@ -144,6 +144,25 @@ steps: nmake condition: and(eq( variables['Agent.OS'], 'Windows_NT'), eq(variables['TOOLCHAIN'], 'MSVC'), eq(variables['MODULE'], ''), ne(variables['VSVER'], '2019')) displayName: build test with qmake with MSVC w/o extra module + - powershell: | + python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) tools_mingw 7.3.0-1-202004170606 qt.tools.win64_mingw730 + [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$(Build.BinariesDirectory)\Qt\Tools\mingw730_64\bin", "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: | + python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) tools_mingw 7.3.0-1-202004170606 qt.tools.win32_mingw730 + [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$(Build.BinariesDirectory)\Qt\Tools\mingw730_32\bin", "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: | + mkdir $(Build.BinariesDirectory)\tests + cd $(Build.BinariesDirectory)\tests + 7z x $(Build.SourcesDirectory)\ci\helloworld.7z + cd .. + qmake $(Build.BinariesDirectory)\tests\helloworld + make + condition: and(eq( variables['Agent.OS'], 'Windows_NT'), eq(variables['TOOLCHAIN'], 'MINGW'), eq(variables['MODULE'], '')) + displayName: build test with qmake with MINGW w/o extra module - script: | mkdir $(Build.BinariesDirectory)/tests (cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/helloworld.7z)