Enable Release Branches for Automated CI (microsoft#226)

wlm328cs · Mar 9, 2020 · 31dbe6c · 31dbe6c
1 parent 0c09ad5
commit 31dbe6c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/.azure/azure-pipelines-int.ci.yml b/.azure/azure-pipelines-int.ci.yml
@@ -5,7 +5,14 @@
 #
 
 trigger:
+  batch: true
+  branches:
+    include:
+    - master
+    - release/*
+pr:
 - master
+- release/*
 
 name: 0.$(Date:yyMM).$(DayOfMonth)$(Rev:rr).0
 

diff --git a/.azure/azure-pipelines.ci.yml b/.azure/azure-pipelines.ci.yml
@@ -4,9 +4,14 @@
 #
 
 trigger:
-- master
+  batch: true
+  branches:
+    include:
+    - master
+    - release/*
 pr:
 - master
+- release/*
 
 name: 0.$(Date:yyMM).$(DayOfMonth)$(Rev:rr).0
 

diff --git a/.azure/scripts/sync-mirror.ps1 b/.azure/scripts/sync-mirror.ps1
@@ -7,34 +7,38 @@ This synchronizes a branch on the current repository to the mirror repo.
     sync-mirror.ps1
 
 .EXAMPLE
-    sync-mirror.ps1 -Branch release/xxxx
+    sync-mirror.ps1 -Branch refs/heads/release/xxxx
 
 #>
 
 param (
     [Parameter(Mandatory = $false)]
-    [string]$Branch = "master"
+    [string]$Branch = "refs/heads/master"
 )
 
 Set-StrictMode -Version 'Latest'
+$PSDefaultParameterValues['*:ErrorAction'] = 'Stop'
 
 # Verify the PAT environmental variable is set.
 if ($null -eq $Env:AzDO_PAT -or "" -eq $Env:AzDO_PAT) {
     Write-Error "PAT for Azure DevOps Repo doesn't exist!"
 }
 
+# Remove the 'refs/heads/' prefix.
+$BranchName = $Branch.Substring(11)
+
 # Make sure we're in the correct branch.
-git checkout $Branch
+git checkout $BranchName
 
 # Add the AzDO repo as a remote.
 git remote add azdo-mirror "https://nibanks:$Env:AzDO_PAT@mscodehub.visualstudio.com/msquic/_git/msquic"
 
 # Reset branch to origin.
-git reset --hard origin/$Branch
+git reset --hard origin/$BranchName
 
 # Push to the AzDO repo.
 try {
-    git push azdo-mirror $Branch
+    git push azdo-mirror $BranchName
 } catch {
     Write-Host "Supressing exception while running 'git push'"
 }

diff --git a/.azure/templates/sync-mirror.yml b/.azure/templates/sync-mirror.yml
@@ -1,11 +1,8 @@
 # This template contains steps to sync the GitHub repo to the AzDO mirror repo.
 
-parameters:
-  branch: 'master'
-
 jobs:
-- job: mirror_${{ parameters.branch }}
-  displayName: Mirror ${{ parameters.branch }} branch
+- job: mirror
+  displayName: Mirror branch
   pool:
     vmImage: windows-latest
   steps:
@@ -17,6 +14,6 @@ jobs:
     inputs:
       pwsh: true
       filePath: .azure/scripts/sync-mirror.ps1
-      arguments: -Branch ${{ parameters.branch }}
+      arguments: -Branch $(Build.SourceBranch)
     env:
       AzDO_PAT: $(AzDO_PAT)