enable patch releases (fix) (#5634)

This is applying, on `master`, the same patch as #5605 applied on
`release/1.0.x`.

CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Gary Verhaegen 2020-04-20 17:01:08 +02:00 committed by GitHub
parent d8db88e7e1
commit 88c389c17a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions

View File

@ -210,7 +210,7 @@ jobs:
condition: and(succeeded(),
eq(dependencies.check_for_release.outputs['out.is_release'], 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')))
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
pool:
vmImage: "Ubuntu-16.04"
variables:
@ -302,7 +302,7 @@ jobs:
vmImage: "Ubuntu-16.04"
condition: and(eq(dependencies.check_for_release.outputs['out.is_release'], 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')))
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
variables:
release_sha: $[ dependencies.check_for_release.outputs['out.release_sha'] ]
release_tag: $[ dependencies.check_for_release.outputs['out.release_tag'] ]

View File

@ -68,7 +68,7 @@ steps:
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')),
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')),
eq('${{parameters.name}}', 'linux'))
- bash: |
set -euo pipefail
@ -83,7 +83,7 @@ steps:
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')))
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
- task: PublishPipelineArtifact@0
inputs:
targetPath: $(Build.StagingDirectory)/$(publish.tarball)
@ -91,7 +91,7 @@ steps:
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')))
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
- task: PublishPipelineArtifact@0
inputs:
targetPath: $(Build.StagingDirectory)/$(publish.protos-zip)
@ -99,5 +99,5 @@ steps:
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')),
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')),
eq('${{parameters.name}}', 'linux'))

View File

@ -52,12 +52,12 @@ steps:
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')))
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
- task: PublishPipelineArtifact@0
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')))
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
inputs:
targetPath: $(Build.StagingDirectory)/$(publish.installer)
artifactName: $(publish.installer)
@ -65,7 +65,7 @@ steps:
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')))
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
inputs:
targetPath: $(Build.StagingDirectory)/$(publish.tarball)
artifactName: $(publish.tarball)

View File

@ -21,4 +21,4 @@ steps:
$(Slack.team-daml)
condition: and(failed(),
or(eq(variables['Build.SourceBranchName'], 'master'),
startsWith(variables['Build.SourceBranchName'], 'release/')))
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))