Skip to content

Commit a5a4f7f

Browse files
Rename master -> main
1 parent 069dc7c commit a5a4f7f

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/autogenerateBatch0.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
run: |
2828
git checkout autogenerate
2929
git pull
30-
git merge --no-commit --no-ff --strategy-option=theirs origin/master --allow-unrelated-histories
30+
git merge --no-commit --no-ff --strategy-option=theirs origin/main --allow-unrelated-histories
3131
if ! git diff-index --quiet HEAD --; then
32-
git commit -m "Merge remote-tracking branch 'origin/master' into autogenerate"
32+
git commit -m "Merge remote-tracking branch 'origin/main' into autogenerate"
3333
git push origin autogenerate
3434
fi
3535

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
pull_request:
5-
branches: [ master ]
5+
branches: [ main ]
66
jobs:
77
build:
88
runs-on: ubuntu-latest

azure-pipelines-autogen.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ jobs:
4646
set -Eeuxo pipefail
4747
git checkout $(Build.SourceBranchName)
4848
git pull
49-
git merge --no-commit --no-ff --strategy-option=theirs origin/master
49+
git merge --no-commit --no-ff --strategy-option=theirs origin/main
5050
if ! git diff-index --quiet HEAD --; then
51-
git commit -m "Merge remote-tracking branch 'origin/master' into $(Build.SourceBranchName)"
51+
git commit -m "Merge remote-tracking branch 'origin/main' into $(Build.SourceBranchName)"
5252
git push origin $(Build.SourceBranchName)
5353
fi
54-
displayName: Integrate master branch
54+
displayName: Integrate main branch
5555
5656
- script: |
5757
set -Eeuxo pipefail

generator/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ View the Pipeline Configuration [here](/azure-pipelines-autogen.yml).
2828
#### Merging Pipeline-generated schemas
2929

3030
1. Review the status badge on this page to ensure the latest run was successful.
31-
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).
31+
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).
3232
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).
3333

3434
#### Onboarding to the autogeneration pipeline

generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
2+
"$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
33
"name": "azure-schema-generator",
44
"private": true,
55
"version": "1.0.0",

swagger_to_sdk_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
2+
"$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
33
"initOptions": {
44
"initScript": {
55
"path": ".sdkauto/initScript.sh"

0 commit comments

Comments
 (0)