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

Test external command for mingw

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2020-02-11 10:09:35 +09:00
parent 634a03250b
commit 2b5ef5b154
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
azure-pipelines.yml
View File

@@ -41,6 +41,21 @@ jobs:
steps: steps:
- template: ci/steps.yml - 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 - job: LinuxSpecificMirror
displayName: Linux (Specific Mirror) displayName: Linux (Specific Mirror)
variables: variables:

4
ci/generate_azure_pipelines_matrices.py
View File

@@ -86,9 +86,9 @@ windows_build_jobs.extend(
[ [
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'), BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'), 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', 'win64_mingw73', 'mingw73_64'),
BuildJob('5.13.2', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'), BuildJob('5.13.2', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
BuildJob('5.13.2', 'windows', 'desktop', 'win32_mingw73', 'mingw73_32'), # BuildJob('5.13.2', 'windows', 'desktop', 'win32_mingw73', 'mingw73_32'),
] ]
) )

14
ci/steps.yml
View File

@@ -28,7 +28,7 @@ steps:
scriptPath: $(Build.SourcesDirectory)/bin/aqt scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH)
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
condition: and(not(variables['QT_BASE_MIRROR']), not(variables['TOOL_NAME']), eq(variables['MODULE'], '')) condition: and(not(variables['QT_BASE_MIRROR']), not(variables['TOOL_NAME']), not(variables['EXTERNAL']), eq(variables['MODULE'], ''))
displayName: Run Aqt (No Base URL Set) displayName: Run Aqt (No Base URL Set)
- task: PythonScript@0 - task: PythonScript@0
inputs: inputs:
@@ -36,7 +36,7 @@ steps:
scriptPath: $(Build.SourcesDirectory)/bin/aqt scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -b $(QT_BASE_MIRROR) arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -b $(QT_BASE_MIRROR)
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
condition: and(variables['QT_BASE_MIRROR'], not(variables['TOOL_NAME']), eq(variables['MODULE'], '')) condition: and(variables['QT_BASE_MIRROR'], not(variables['TOOL_NAME']), not(variables['EXTERNAL']), eq(variables['MODULE'], ''))
displayName: Run Aqt (Base URL Set) displayName: Run Aqt (Base URL Set)
- task: PythonScript@0 - task: PythonScript@0
inputs: inputs:
@@ -44,8 +44,16 @@ steps:
scriptPath: $(Build.SourcesDirectory)/bin/aqt scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -m $(MODULE) arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -m $(MODULE)
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
condition: and(not(variables['TOOL_NAME']), ne(variables['MODULE'], '')) condition: and(not(variables['TOOL_NAME']), not(variables['EXTERNAL']), ne(variables['MODULE'], ''))
displayName: Run Aqt (With modules) displayName: Run Aqt (With modules)
- task: PythonScript@0
inputs:
scriptSource: filePath
scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -E "$(EXTERNAL)"
workingDirectory: $(Build.BinariesDirectory)
condition: and(not(variables['TOOL_NAME']), variables['EXTERNAL'])
displayName: Run Aqt (With external 7zip)
# Test installation environments # Test installation environments
##---------------------------------------------------- ##----------------------------------------------------