use default branch variable

umn-microsoft-automation · Jan 29, 2021 · 36063de · 36063de
1 parent 4e62df1
commit 36063de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/PSModules/stages/deploy-module.yml b/PSModules/stages/deploy-module.yml
@@ -11,7 +11,7 @@ parameters:
 stages:
 - stage: Deploy
   dependsOn: Test
-  #condition: and(succeeded(), eq(variables['build.sourceBranch'], 'refs/heads/master'))
+  #condition: and(succeeded(), eq(variables['build.sourceBranchName'], '${{ parameters.DefaultBranch }}'))
   jobs:
     - job: Publish
       pool: Default
@@ -56,7 +56,7 @@ stages:
           includeRootFolder: true
           archiveType: zip
           archiveFile: '$(Build.ArtifactStagingDirectory)\${{ parameters.ModuleName }}.zip'
-        condition: and(succeeded(), eq(variables['build.sourceBranch'], 'refs/heads/master'))
+        condition: and(succeeded(), eq(variables['build.sourceBranchName'], '${{ parameters.DefaultBranch }}'))
       - powershell: |
           gci env:
           $auth = '${{ parameters.GitHubPAT }}'
@@ -85,7 +85,7 @@ stages:
           $uploadurl = ($release.upload_url).Split('{')[0] + '?name=${{ parameters.ModuleName }}.zip'
           ($asset = Invoke-RestMethod -Uri $uploadurl -Method Post -InFile '$(Build.ArtifactStagingDirectory)\${{ parameters.ModuleName }}.zip' -Headers $ghHeader -ContentType 'application/zip')
         displayName: Publish Release
-        condition: and(succeeded(), eq(variables['build.sourceBranch'], 'refs/heads/master'))
+        condition: and(succeeded(), eq(variables['build.sourceBranchName'], '${{ parameters.DefaultBranch }}'))
     - deployment: Test
       dependsOn: Publish
       variables:
@@ -103,7 +103,7 @@ stages:
                   RepoName: ${{ parameters.RepoName }}
                   ModuleName: ${{ parameters.ModuleName }}
     - deployment: Production
-      condition: and(succeeded(), eq(variables['build.sourceBranch'], 'refs/heads/master'))
+      condition: and(succeeded(), eq(variables['build.sourceBranchName'], '${{ parameters.DefaultBranch }}'))
       dependsOn: Publish
       variables:
         PackageVersion: $[ dependencies.Publish.outputs['PublishModule.PackageVersion']]

diff --git a/PSModules/umn-module.yml b/PSModules/umn-module.yml
@@ -9,6 +9,9 @@ parameters:
 - name: FailOnTestFailure
   type: boolean
   default: true
+- name: DefaultBranch
+  type: string
+  default: master
 - name: GitHubPAT
   type: string
   default: "this will fail"