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

AP: drop tools test which done on mingw test

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2020-05-04 12:57:03 +09:00
parent 5dad9c9718
commit 8419b21a00
2 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
azure-pipelines.yml
View File

@@ -72,18 +72,3 @@ jobs:
vmImage: 'ubuntu-16.04'
steps:
- template: ci/steps.yml
- job: LinuxToolsOpenSSL
displayName: Tools(OpenSSL, Linux)
variables:
PYTHON_VERSION: '3.7'
HOST: linux
TOOL_NAME: tools_openssl_x64
TOOL_VERSION: 1.1.1-4
ARCH: qt.tools.openssl.gcc_64
TEST_EXECUTABLE: OpenSSL/binary/bin/openssl
TEST_COMMAND: version
pool:
vmImage: 'ubuntu-16.04'
steps:
- template: ci/steps.yml

32
ci/steps.yml
View File

@@ -145,26 +145,23 @@ steps:
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: |
choco uninstall -y mingw
python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) tools_mingw 8.1.0-1-202004170606 qt.tools.win64_mingw810
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
condition: and(eq( variables['Agent.OS'], 'Windows_NT'), eq(variables['TOOLCHAIN'], 'MINGW'), eq(variables['ARCH'], 'win64_mingw81'))
displayName: Install Mingw81(win64) from Qt distribution and set PATH
- powershell: |
choco uninstall -y mingw
python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) tools_mingw 8.1.0-1-202004170606 qt.tools.win32_mingw810
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
condition: and(eq( variables['Agent.OS'], 'Windows_NT'), eq(variables['TOOLCHAIN'], 'MINGW'), eq(variables['ARCH'], 'win32_mingw81'))
displayName: Install Mingw81(win32) from Qt distribution and set PATH
- powershell: |
$env:Path += ";$(Build.BinariesDirectory)\Qt\$(QT_VERSION)\$(ARCHDIR)\bin"
$env:Path += ";$(Build.BinariesDirectory)\Qt\Tools\$(ARCHDIR)\bin"
$env:Path = "$(Build.BinariesDirectory)\Qt\Tools\$(ARCHDIR)\bin;$(Build.BinariesDirectory)\Qt\$(QT_VERSION)\$(ARCHDIR)\bin;" + $env:Path
mkdir $(Build.BinariesDirectory)\tests
cd $(Build.BinariesDirectory)\tests
7z x $(Build.SourcesDirectory)\ci\helloworld.7z
cd ..
qmake $(Build.BinariesDirectory)\tests\helloworld
make
mingw32-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: |
@@ -204,19 +201,6 @@ steps:
condition: and(eq(variables['TARGET'], 'ios'), eq(variables['Agent.OS'], 'Darwin'))
displayName: Build test with qmake for ios
##----------------------------------------------------
# Tools Support
- script: python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) $(TOOL_NAME) $(TOOL_VERSION) $(ARCH)
workingDirectory: $(Build.BinariesDirectory)
condition: variables['TOOL_NAME']
displayName: Run Aqt (Tool)
# Test installation results
- script: |
$(Build.BinariesDirectory)/Qt/Tools/$(TEST_EXECUTABLE) $(TEST_COMMAND)
condition: variables['TOOL_NAME']
displayName: Tool test
##----------------------------------------------------
##----------------------------------------------------
# wasm_32 on linux and mac
- script: |