Skip to content

Commit

Permalink
Merge pull request #13 from Sitecore/fix-build-yml-main-branch
Browse files Browse the repository at this point in the history
fix main branch name in build scripts
  • Loading branch information
nickwesselman authored Feb 23, 2021
2 parents feb5d9e + 7f67833 commit 8a2e46e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions image/build/azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
trigger:
branches:
include:
- master
- main
- dev
paths:
include:
Expand All @@ -12,7 +12,7 @@ trigger:
pr:
branches:
include:
- master
- main
- dev
paths:
include:
Expand All @@ -31,10 +31,10 @@ variables:
buildImage: mcr.microsoft.com/windows/servercore:ltsc2019
buildNumber: $(Build.BuildID)
REGISTRY_MAPPED: $(Registry)
${{ if eq(variables['Build.SourceBranchName'], 'master') }}:
${{ if eq(variables['Build.SourceBranchName'], 'main') }}:
stability: ''
namespace: 'tools'
${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
${{ if ne(variables['Build.SourceBranchName'], 'main') }}:
stability: '-unstable'
namespace: 'experimental'

Expand Down
8 changes: 4 additions & 4 deletions powershell/build/azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
trigger:
branches:
include:
- master
- main
- dev
paths:
include:
Expand All @@ -12,7 +12,7 @@ trigger:
pr:
branches:
include:
- master
- main
- dev
paths:
include:
Expand All @@ -27,9 +27,9 @@ variables:
sitecoreVersion: 10.1
revision: $[counter(format('sitecoreVersion{0}', variables['sitecoreVersion']), 0)]
moduleVer: $(sitecoreVersion).$(revision)
${{ if eq(variables['Build.SourceBranchName'], 'master') }}:
${{ if eq(variables['Build.SourceBranchName'], 'main') }}:
prerelease: ''
${{ if ne(variables['Build.SourceBranchName'], 'master') }}:
${{ if ne(variables['Build.SourceBranchName'], 'main') }}:
prerelease: '-unstable'
buildVer: $(moduleVer)$(prerelease)

Expand Down

0 comments on commit 8a2e46e

Please sign in to comment.