Change default branch name to main (#15840)

Azure · Jun 18, 2021 · d769b84 · d769b84
1 parent e823b26
commit d769b84
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/eng/pipelines/mgmt-ci.yml b/eng/pipelines/mgmt-ci.yml
@@ -2,6 +2,7 @@ trigger:
   branches:
     include:
       - master
+      - main
   paths:
     include:
     - eng/pipelines/mgmt-pr.yml
@@ -220,7 +221,7 @@ jobs:
         inputs:
           verbose: false
 
-      - script: 'gulp pack --base-reference=master --head-reference=master'
+      - script: 'gulp pack --base-reference=main --head-reference=main'
         displayName: 'gulp pack'
 
       - task: CopyFiles@2

diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
@@ -33,7 +33,7 @@ jobs:
       - script: |
           echo "##vso[build.addbuildtag]Scheduled"
         displayName: "Tag scheduled builds"
-        condition: and(always(),and(eq(variables['Build.SourceBranchName'],'master'),eq(variables['Build.Reason'],'Schedule')))
+        condition: and(always(),and(eq(variables['Build.SourceBranchName'],'main'),eq(variables['Build.Reason'],'Schedule')))
 
       - template: ../steps/common.yml
 

diff --git a/sdk/storage/test-resources-post.ps1 b/sdk/storage/test-resources-post.ps1
@@ -5,8 +5,8 @@
 # There are no documented approaches to specifying CORS rules using ARM, this is a workaround until
 # support for setting CORS rules is added to ARM for Queues
 
-# It is invoked by the https://github.com/Azure/azure-sdk-for-js/blob/master/eng/New-TestResources.ps1
-# script after the ARM template, defined in https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/storage/test-resources.json,
+# It is invoked by the https://github.com/Azure/azure-sdk-for-js/blob/main/eng/New-TestResources.ps1
+# script after the ARM template, defined in https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/storage/test-resources.json,
 # is finished being deployed. The ARM template is responsible for creating the Storage accounts needed for live tests.
 
 param (

diff --git a/sdk/tables/test-resources-post.ps1 b/sdk/tables/test-resources-post.ps1
@@ -5,8 +5,8 @@
 # There are no documented approaches to specifying CORS rules using ARM, this is a workaround until
 # support for setting CORS rules is added to ARM for Tables
 
-# It is invoked by the https://github.com/Azure/azure-sdk-for-js/blob/master/eng/New-TestResources.ps1
-# script after the ARM template, defined in https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/tables/test-resources.json,
+# It is invoked by the https://github.com/Azure/azure-sdk-for-js/blob/main/eng/New-TestResources.ps1
+# script after the ARM template, defined in https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/tables/test-resources.json,
 # is finished being deployed. The ARM template is responsible for creating the Storage accounts needed for live tests.
 
 param (
@@ -35,4 +35,4 @@ $corsRules = (@{
 
 Set-AzStorageCORSRule -ServiceType 'Table' -CorsRules $corsRules -Context $context
 
-Write-Verbose "CORS rule set for $storageAccountName"
+Write-Verbose "CORS rule set for $storageAccountName"