Skip to content

Commit 9a6f327

Browse files
authored
build: changes for renaming primary branch to main [12.2.x] (#24830)
Changes of the `DIRECT` phase for the "renaming master to main" migration/planning doc.
1 parent 197c327 commit 9a6f327

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.circleci/rebase-pr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function getShaFromRef(ref) {
152152
* by committerdate.
153153
*
154154
* example:
155-
* upstream/master
155+
* upstream/main
156156
* upstream/9.0.x
157157
* upstream/test
158158
* 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/utils/config';
77
export const github: GithubConfig = {
88
owner: 'angular',
99
name: 'components',
10-
mainBranchName: 'master',
10+
mainBranchName: 'main',
1111
};

scripts/deploy/publish-build-artifacts.sh

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

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

4444
commitSha=$(git rev-parse --short HEAD)
4545
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)