Skip to content

Commit 88ebc51

Browse files
authored
Disable signing in main, simplify condition for release (#48671)
2 parents d73e8cc + 2ecfaa7 commit 88ebc51

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ variables:
8686
- ${{ elseif eq(variables['Build.Reason'], 'PullRequest') }}:
8787
- name: signEnabled
8888
value: true
89-
# Pass sign on the internal project if the, branch is a main or release branch
90-
- ${{ elseif and(eq(variables['System.TeamProject'], 'internal'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), contains(variables['Build.SourceBranch'], '-preview')))) }}:
89+
# Pass sign on the internal project if the, branch is a release branch
90+
- ${{ elseif and(eq(variables['System.TeamProject'], 'internal'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
9191
- name: signEnabled
9292
value: true
9393
# Do not sign otherwise.
@@ -104,7 +104,7 @@ variables:
104104
value: false
105105
# Otherwise, sign if the branch is a release branch.
106106
# We can't sign the DAC in main because the certificates are locked down.
107-
- ${{ elseif and(eq(variables['System.TeamProject'], 'internal'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/reltest/'), and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), contains(variables['Build.SourceBranch'], '-preview')))) }}:
107+
- ${{ elseif and(eq(variables['System.TeamProject'], 'internal'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
108108
- name: signDacEnabled
109109
value: true
110110
- ${{ else }}:

src/SourceBuild/content/eng/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ parameters:
3333
- name: desiredSigning
3434
displayName: 'Sign?'
3535
type: string
36-
default: 'Default (unsigned for manual and non-main/release builds)'
36+
default: 'Default (unsigned for non release-branch builds)'
3737
values:
3838
- Signed
3939
- Unsigned
40-
- Default (unsigned for manual and non-main/release builds)
40+
- Default (unsigned for non release-branch builds)
4141

4242
- name: desiredIBC
4343
displayName: 'Enable IBC?'

0 commit comments

Comments
 (0)