Skip to content

Commit 090d40f

Browse files
authored
build: changes for renaming primary branch to main (#24828)
Changes of the `DIRECT` phase for the "renaming master to main" migration/planning doc.
1 parent 32d31c7 commit 090d40f

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.circleci/rebase-pr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function getShaFromRef(ref) {
157157
* by committerdate.
158158
*
159159
* example:
160-
* upstream/master
160+
* upstream/main
161161
* upstream/9.0.x
162162
* upstream/test
163163
* upstream/1.1.x

.ng-dev/github.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ import {GithubConfig} from '@angular/dev-infra-private/ng-dev';
77
export const github: GithubConfig = {
88
owner: 'angular',
99
name: 'components',
10-
mainBranchName: 'master',
10+
mainBranchName: 'main',
1111
};

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"automerge": false,
4-
"baseBranches": ["master"],
4+
"baseBranches": ["main"],
55
"enabledManagers": ["npm", "bazel", "github-actions"],
66
"stopUpdatingLabel": "merge ready",
77
"labels": ["target: patch", "merge safe"],

scripts/deploy/publish-build-artifacts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ publishPackage() {
4040

4141
buildDir="$(pwd)/dist/releases/${packageName}"
4242
buildVersion=$(node -pe "require('./package.json').version")
43-
branchName=${CIRCLE_BRANCH:-'master'}
43+
branchName=${CIRCLE_BRANCH:-'main'}
4444

4545
commitSha=$(git rev-parse --short HEAD)
4646
commitAuthorName=$(git --no-pager show -s --format='%an' HEAD)

scripts/deploy/publish-docs-content.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ docsContentRepoUrl="https://github.com/angular/material2-docs-content"
3434
buildVersion=$(node -pe "require('./package.json').version")
3535

3636
# Name of the branch that is currently being deployed.
37-
branchName=${CIRCLE_BRANCH:-'master'}
37+
branchName=${CIRCLE_BRANCH:-'main'}
3838

3939
# Additional information about the last commit for docs-content commits.
4040
commitSha=$(git rev-parse --short HEAD)

0 commit comments

Comments
 (0)