Skip to content

Commit f270115

Browse files
committed
Merged PR 7162986: Fix the build quotation marks issue
Fix the build quotation marks issue Fix the set -e issue, failure issue ``` $ OPTIONS="TEST=$([[ a == b ]] && echo a)" $ echo $? 1 ```
2 parents 6e6b63b + 585aac5 commit f270115

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variables:
22
${{ if eq(variables['Build.Reason'],'PullRequest') }}:
3-
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ "$(System.PullRequest.TargetBranch)" =~ ^refs/heads/internal-20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker)'
3+
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ $(System.PullRequest.TargetBranch) =~ ^refs/heads/internal-20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker || echo none)'
44
${{ elseif ne(variables['Build.SourceBranchName'],'internal') }}:
5-
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ "$(Build.SourceBranchName)" =~ ^internal-20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker)'
5+
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=$([[ $(Build.SourceBranchName) =~ ^internal-20[2-9][0-9]{3}$ ]] && echo deb,py2,py3,web,git,docker || echo none)'
66
${{ else }}:
77
VERSION_CONTROL_OPTIONS: ''

0 commit comments

Comments
 (0)