Rename master -> main

Azure · Aug 4, 2021 · a5a4f7f · a5a4f7f
1 parent 069dc7c
commit a5a4f7f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/autogenerateBatch0.yml b/.github/workflows/autogenerateBatch0.yml
@@ -27,9 +27,9 @@ jobs:
         run: |
           git checkout autogenerate
           git pull
-          git merge --no-commit --no-ff --strategy-option=theirs origin/master --allow-unrelated-histories
+          git merge --no-commit --no-ff --strategy-option=theirs origin/main --allow-unrelated-histories
           if ! git diff-index --quiet HEAD --; then
-            git commit -m "Merge remote-tracking branch 'origin/master' into autogenerate"
+            git commit -m "Merge remote-tracking branch 'origin/main' into autogenerate"
             git push origin autogenerate
           fi
           

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/azure-pipelines-autogen.yml b/azure-pipelines-autogen.yml
@@ -46,12 +46,12 @@ jobs:
       set -Eeuxo pipefail
       git checkout $(Build.SourceBranchName)
       git pull
-      git merge --no-commit --no-ff --strategy-option=theirs origin/master
+      git merge --no-commit --no-ff --strategy-option=theirs origin/main
       if ! git diff-index --quiet HEAD --; then
-        git commit -m "Merge remote-tracking branch 'origin/master' into $(Build.SourceBranchName)"
+        git commit -m "Merge remote-tracking branch 'origin/main' into $(Build.SourceBranchName)"
         git push origin $(Build.SourceBranchName)
       fi
-    displayName: Integrate master branch
+    displayName: Integrate main branch
 
   - script: |
       set -Eeuxo pipefail

diff --git a/generator/README.md b/generator/README.md
@@ -28,7 +28,7 @@ View the Pipeline Configuration [here](/azure-pipelines-autogen.yml).
 #### Merging Pipeline-generated schemas
 
 1. Review the status badge on this page to ensure the latest run was successful.
-2. Create a Pull Request from [`autogenerate`](https://github.com/Azure/azure-resource-manager-schemas/tree/autogenerate) to [`master`](https://github.com/Azure/azure-resource-manager-schemas/tree/master).
+2. Create a Pull Request from [`autogenerate`](https://github.com/Azure/azure-resource-manager-schemas/tree/autogenerate) to [`main`](https://github.com/Azure/azure-resource-manager-schemas/tree/main).
 3. If there are any modifications to [schemas/common/autogeneratedResources.json](/schemas/common/autogeneratedResources.json), push a commit to the autogenerate branch to make any corresponding changes to [schemas/2014-04-01-preview/deploymentTemplate.json](/schemas/2014-04-01-preview/deploymentTemplate.json) and [schemas/2015-01-01/deploymentTemplate.json](/schemas/2015-01-01/deploymentTemplate.json).
 
 #### Onboarding to the autogeneration pipeline

diff --git a/generator/package.json b/generator/package.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
   "name": "azure-schema-generator",
   "private": true,
   "version": "1.0.0",

diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
   "initOptions": {
     "initScript": {
       "path": ".sdkauto/initScript.sh"