From 588fb230c33d401869b9d38a58104231c5e483af Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 24 Jun 2019 14:32:05 +0200 Subject: [PATCH] fix build conditions --- build/azure-pipelines/darwin/product-build-darwin.yml | 6 +++--- build/azure-pipelines/linux/product-build-linux-alpine.yml | 2 +- build/azure-pipelines/linux/product-build-linux-arm.yml | 2 +- build/azure-pipelines/linux/product-build-linux.yml | 4 ++-- build/azure-pipelines/win32/product-build-win32.yml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 201a6bdce4c..b465ef9a095 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -50,7 +50,7 @@ steps: yarn gulp hygiene yarn monaco-compile-check displayName: Run hygiene checks - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - script: | set -e @@ -72,13 +72,13 @@ steps: # APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`" # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME" displayName: Run unit tests - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - script: | set -e ./scripts/test-integration.sh --build --tfs "Integration Tests" displayName: Run integration tests - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - script: | set -e diff --git a/build/azure-pipelines/linux/product-build-linux-alpine.yml b/build/azure-pipelines/linux/product-build-linux-alpine.yml index 71dfb920677..107f7fa0cec 100644 --- a/build/azure-pipelines/linux/product-build-linux-alpine.yml +++ b/build/azure-pipelines/linux/product-build-linux-alpine.yml @@ -59,7 +59,7 @@ steps: yarn gulp hygiene yarn monaco-compile-check displayName: Run hygiene checks - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - script: | set -e diff --git a/build/azure-pipelines/linux/product-build-linux-arm.yml b/build/azure-pipelines/linux/product-build-linux-arm.yml index 8eb75c58aa9..ffa6d18f68e 100644 --- a/build/azure-pipelines/linux/product-build-linux-arm.yml +++ b/build/azure-pipelines/linux/product-build-linux-arm.yml @@ -59,7 +59,7 @@ steps: yarn gulp hygiene yarn monaco-compile-check displayName: Run hygiene checks - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - script: | set -e diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 691851fbf97..fa26c26dd1c 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -51,7 +51,7 @@ steps: yarn gulp hygiene yarn monaco-compile-check displayName: Run hygiene checks - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - script: | set -e @@ -76,7 +76,7 @@ steps: DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests" # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)" displayName: Run unit tests - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - script: | set -e diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 6505b9a8df2..18758af4f99 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -55,7 +55,7 @@ steps: exec { yarn gulp hygiene } exec { yarn monaco-compile-check } displayName: Run hygiene checks - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - powershell: | . build/azure-pipelines/win32/exec.ps1 @@ -78,7 +78,7 @@ steps: exec { yarn gulp "electron-$(VSCODE_ARCH)" } exec { .\scripts\test.bat --build --tfs "Unit Tests" } displayName: Run unit tests - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - powershell: | . build/azure-pipelines/win32/exec.ps1 @@ -86,7 +86,7 @@ steps: exec { yarn gulp "electron-$(VSCODE_ARCH)" } exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" } displayName: Run integration tests - condition: eq(variables['VSCODE_STEP_ON_IT'], 'false') + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 inputs: -- GitLab