try to fix split-release job for main-2.x (#18161)

This commit is contained in:
Gary Verhaegen 2024-01-15 11:55:40 +01:00 committed by GitHub
parent 835c683505
commit 7be5899f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -110,7 +110,7 @@ steps:
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq('${{parameters.scala_version}}', ''),
eq(variables['Build.SourceBranchName'], 'main'),
in(variables['Build.SourceBranchName'], 'main', 'main-2.x'),
in('${{parameters.name}}', 'linux', 'linux-scala-2.12'))
- template: bash-lib.yml
parameters:
@ -129,7 +129,7 @@ steps:
condition: and(succeeded(),
ne('${{parameters.name}}', 'm1'),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'main'))
in(variables['Build.SourceBranchName'], 'main', 'main-2.x'))
- task: PublishPipelineArtifact@0
inputs:
targetPath: $(Build.StagingDirectory)/release
@ -137,4 +137,4 @@ steps:
condition: and(succeeded(),
ne('${{parameters.name}}', 'm1'),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'main'))
in(variables['Build.SourceBranchName'], 'main', 'main-2.x'))

View File

@ -77,12 +77,12 @@ steps:
DAML_SDK_RELEASE_VERSION: ${{parameters.release_tag}}
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'main'))
in(variables['Build.SourceBranchName'], 'main', 'main-2.x'))
- task: PublishPipelineArtifact@0
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'main'))
in(variables['Build.SourceBranchName'], 'main', 'main-2.x'))
inputs:
targetPath: $(Build.StagingDirectory)/release
artifactName: windows-release

View File

@ -103,7 +103,7 @@ jobs:
value: $[ dependencies.check_for_release.outputs['out.split_release_process'] ]
- name: skip_tests
value: $[ and(eq(variables.is_release, 'true'),
eq(variables['Build.SourceBranchName'], 'main')) ]
in(variables['Build.SourceBranchName'], 'main', 'main-2.x')) ]
- template: job-variables.yml
timeoutInMinutes: 240
pool: