diff --git a/.ng-dev/github.ts b/.ng-dev/github.ts index 5dac56fb31..60cc4be968 100644 --- a/.ng-dev/github.ts +++ b/.ng-dev/github.ts @@ -7,5 +7,5 @@ import { GithubConfig } from '@angular/dev-infra-private/ng-dev'; export const github: GithubConfig = { owner: 'angular', name: 'angular-cli', - mainBranchName: 'master', + mainBranchName: 'main', }; diff --git a/renovate.json b/renovate.json index 3e5ffd7992..7e3b8d60bd 100644 --- a/renovate.json +++ b/renovate.json @@ -10,7 +10,7 @@ "enabled": true }, "schedule": ["after 10pm every weekday", "before 4am every weekday", "every weekend"], - "baseBranches": ["master"], + "baseBranches": ["main"], "ignoreDeps": ["@types/node", "quicktype-core"], "packageFiles": [ "WORKSPACE", diff --git a/scripts/publish.ts b/scripts/publish.ts index 12d4a32fbe..631e2bd705 100644 --- a/scripts/publish.ts +++ b/scripts/publish.ts @@ -65,10 +65,10 @@ function _branchCheck(args: PublishArgs, logger: logging.Logger) { const branch = ref.trim().replace(/^refs\/heads\//, ''); switch (branch) { - case 'master': + case 'main': if (args.tag !== 'next') { throw new Error(tags.oneLine` - Releasing from master requires a next tag. Use --no-branchCheck to + Releasing from main requires a next tag. Use --no-branchCheck to skip this check. `); } diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts index 02e6775243..37a97f3b42 100644 --- a/scripts/snapshots.ts +++ b/scripts/snapshots.ts @@ -144,7 +144,7 @@ export default async function (opts: SnapshotsOptions, logger: logging.Logger) { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'angular-cli-publish-')); const message = execSync(`git log --format="%h %s" -n1`).toString().trim(); - let branch = opts.branch || 'master'; + let branch = opts.branch || 'main'; // CIRCLE_BRANCH if (typeof process.env['CIRCLE_BRANCH'] == 'string') {