Skip to content

Commit f4ecef8

Browse files
devversionjosephperrott
authored andcommitted
build: changes for primary branch rename to main.
Changes part of the `DIRECT` phase of the "renaming master to main" planning doc. (cherry picked from commit 8da9269)
1 parent 2caf1ea commit f4ecef8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.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: 'angular-cli',
10-
mainBranchName: 'master',
10+
mainBranchName: 'main',
1111
};

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"enabled": true
1111
},
1212
"schedule": ["after 10pm every weekday", "before 4am every weekday", "every weekend"],
13-
"baseBranches": ["master"],
13+
"baseBranches": ["main"],
1414
"ignoreDeps": ["@types/node", "quicktype-core"],
1515
"packageFiles": [
1616
"WORKSPACE",

scripts/publish.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ function _branchCheck(args: PublishArgs, logger: logging.Logger) {
6565
const branch = ref.trim().replace(/^refs\/heads\//, '');
6666

6767
switch (branch) {
68-
case 'master':
68+
case 'main':
6969
if (args.tag !== 'next') {
7070
throw new Error(tags.oneLine`
71-
Releasing from master requires a next tag. Use --no-branchCheck to
71+
Releasing from main requires a next tag. Use --no-branchCheck to
7272
skip this check.
7373
`);
7474
}

scripts/snapshots.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export default async function (opts: SnapshotsOptions, logger: logging.Logger) {
144144

145145
const root = fs.mkdtempSync(path.join(os.tmpdir(), 'angular-cli-publish-'));
146146
const message = execSync(`git log --format="%h %s" -n1`).toString().trim();
147-
let branch = opts.branch || 'master';
147+
let branch = opts.branch || 'main';
148148

149149
// CIRCLE_BRANCH
150150
if (typeof process.env['CIRCLE_BRANCH'] == 'string') {

0 commit comments

Comments
 (0)