From 17f8bcd37d4a541712b7372659380c058374d2b4 Mon Sep 17 00:00:00 2001
From: Gary Verhaegen <gary.verhaegen@digitalasset.com>
Date: Wed, 17 Mar 2021 10:46:02 +0100
Subject: [PATCH] fix release job (#9166)

Three issues here:

1. The release job runs on an Azure-hosted agent, so it doesn't have the
   `reset_caches.sh` script (and doesn't need it).
2. The `bash-lib` step should not run if the current job has already
   failed.
3. The `skip-github` jobs should also not run if the job  has failed.

CHANGELOG_BEGIN
CHANGELOG_END
---
 azure-pipelines.yml | 13 ++++++-------
 ci/bash-lib.yml     |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d91a0f53a6..56fd3a5fbf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -62,7 +62,6 @@ jobs:
         set -euo pipefail
         git checkout $(release_sha)
       name: checkout_release
-    - template: ci/clean-up.yml
     - template: ci/bash-lib.yml
       parameters:
         var_name: bash-lib
@@ -79,17 +78,17 @@ jobs:
       inputs:
         artifactName: linux-release
         targetPath: $(Build.StagingDirectory)/release-artifacts
-      condition: not(eq(variables['skip-github'], 'TRUE'))
+      condition: and(succeeded(), not(eq(variables['skip-github'], 'TRUE')))
     - task: DownloadPipelineArtifact@0
       inputs:
         artifactName: macos-release
         targetPath: $(Build.StagingDirectory)/release-artifacts
-      condition: not(eq(variables['skip-github'], 'TRUE'))
+      condition: and(succeeded(), not(eq(variables['skip-github'], 'TRUE')))
     - task: DownloadPipelineArtifact@0
       inputs:
         artifactName: windows-release
         targetPath: $(Build.StagingDirectory)/release-artifacts
-      condition: not(eq(variables['skip-github'], 'TRUE'))
+      condition: and(succeeded(), not(eq(variables['skip-github'], 'TRUE')))
     - bash: |
         set -euo pipefail
         KEY_FILE=$(mktemp)
@@ -128,13 +127,13 @@ jobs:
         isPrerelease: true
         releaseNotesSource: 'input'
         releaseNotes: "This is a pre-release. Use at your own risk."
-      condition: not(eq(variables['skip-github'], 'TRUE'))
+      condition: and(succeeded(), not(eq(variables['skip-github'], 'TRUE')))
     - bash: |
         set -euo pipefail
         ./ci/publish-artifactory.sh $(Build.StagingDirectory) $(release_tag)
       env:
         AUTH: $(ARTIFACTORY_USERNAME):$(ARTIFACTORY_PASSWORD)
-      condition: not(eq(variables['skip-github'], 'TRUE'))
+      condition: and(succeeded(), not(eq(variables['skip-github'], 'TRUE')))
     - bash: |
         set -euo pipefail
 
@@ -152,7 +151,7 @@ jobs:
       name: backup_to_gcs
       env:
         GCRED: $(GOOGLE_APPLICATION_CREDENTIALS_CONTENT)
-      condition: not(eq(variables['skip-github'], 'TRUE'))
+      condition: and(succeeded(), not(eq(variables['skip-github'], 'TRUE')))
     - bash: |
         set -euo pipefail
         msg=$(git log -n1 --format=%b HEAD | head -1)
diff --git a/ci/bash-lib.yml b/ci/bash-lib.yml
index deb631456f..c921e34be3 100644
--- a/ci/bash-lib.yml
+++ b/ci/bash-lib.yml
@@ -152,4 +152,3 @@ steps:
     END
     echo "##vso[task.setvariable variable=${{parameters.var_name}}]$TMP"
   displayName: install Bash lib
-  condition: always()