From 6a8f5cee219da9face83309c342b05625c544975 Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Sun, 22 Nov 2020 12:31:08 +0900 Subject: [PATCH] CI: azure: fix conditions Signed-off-by: Hiroshi Miura --- azure-pipelines.yml | 3 ++- ci/steps.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2da3bb8..b9d6ead 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,7 +96,7 @@ jobs: HOST: linux TARGET: desktop TOOL_NAME: src - SUBARCHIVES: qtdoc + SUBARCHIVES: qt pool: vmImage: 'ubuntu-18.04' steps: @@ -123,6 +123,7 @@ jobs: HOST: linux TARGET: desktop TOOL_NAME: doc + SUBARCHIVES: qtdoc pool: vmImage: 'ubuntu-18.04' steps: diff --git a/ci/steps.yml b/ci/steps.yml index 98b0653..4854de4 100644 --- a/ci/steps.yml +++ b/ci/steps.yml @@ -68,7 +68,7 @@ steps: workingDirectory: $(Build.BinariesDirectory) env: 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) - bash: | number=$RANDOM @@ -76,7 +76,7 @@ steps: sleep $number mkdir Qt cd Qt - python -m aqt src $(QT_VERSION) $(HOST) $(TARGET) + python -m aqt src $(QT_VERSION) $(HOST) $(TARGET) --archives $(SUBARCHIVES) workingDirectory: $(Build.BinariesDirectory) env: AQT_CONFIG: $(Build.SourcesDirectory)/ci/settings.ini