CI: azure: fix conditions

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2020-11-22 12:31:08 +09:00
parent efe2501cb4
commit 6a8f5cee21
2 changed files with 4 additions and 3 deletions

View File

@@ -96,7 +96,7 @@ jobs:
HOST: linux HOST: linux
TARGET: desktop TARGET: desktop
TOOL_NAME: src TOOL_NAME: src
SUBARCHIVES: qtdoc SUBARCHIVES: qt
pool: pool:
vmImage: 'ubuntu-18.04' vmImage: 'ubuntu-18.04'
steps: steps:
@@ -123,6 +123,7 @@ jobs:
HOST: linux HOST: linux
TARGET: desktop TARGET: desktop
TOOL_NAME: doc TOOL_NAME: doc
SUBARCHIVES: qtdoc
pool: pool:
vmImage: 'ubuntu-18.04' vmImage: 'ubuntu-18.04'
steps: steps:

View File

@@ -68,7 +68,7 @@ steps:
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
env: env:
AQT_CONFIG: $(Build.SourcesDirectory)/ci/settings.ini AQT_CONFIG: $(Build.SourcesDirectory)/ci/settings.ini
condition: ne(variables['SUBARCHIVES'], '') condition: and(ne(variables['SUBARCHIVES'], ''), eq(variables['TOOL_NAME'], '']
displayName: Run Aqt (sub arhives option) displayName: Run Aqt (sub arhives option)
- bash: | - bash: |
number=$RANDOM number=$RANDOM
@@ -76,7 +76,7 @@ steps:
sleep $number sleep $number
mkdir Qt mkdir Qt
cd Qt cd Qt
python -m aqt src $(QT_VERSION) $(HOST) $(TARGET) python -m aqt src $(QT_VERSION) $(HOST) $(TARGET) --archives $(SUBARCHIVES)
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
env: env:
AQT_CONFIG: $(Build.SourcesDirectory)/ci/settings.ini AQT_CONFIG: $(Build.SourcesDirectory)/ci/settings.ini