From 00db6899b80b1fc093b25a4ca4fe0003c069fedc Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 25 Apr 2022 12:51:37 +0000 Subject: [PATCH] build: changes for renaming primary branch to `main` [12.2.x] Changes of the `DIRECT` phase for the "renaming master to main" migration/planning doc. --- .circleci/rebase-pr.js | 2 +- .ng-dev/github.ts | 2 +- scripts/deploy/publish-build-artifacts.sh | 2 +- scripts/deploy/publish-docs-content.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/rebase-pr.js b/.circleci/rebase-pr.js index 8f19e20a7aee..3eb5677edeb3 100644 --- a/.circleci/rebase-pr.js +++ b/.circleci/rebase-pr.js @@ -152,7 +152,7 @@ function getShaFromRef(ref) { * by committerdate. * * example: - * upstream/master + * upstream/main * upstream/9.0.x * upstream/test * upstream/1.1.x diff --git a/.ng-dev/github.ts b/.ng-dev/github.ts index b48fd6c7fa35..97190f19d9b8 100644 --- a/.ng-dev/github.ts +++ b/.ng-dev/github.ts @@ -7,5 +7,5 @@ import {GithubConfig} from '@angular/dev-infra-private/ng-dev/utils/config'; export const github: GithubConfig = { owner: 'angular', name: 'components', - mainBranchName: 'master', + mainBranchName: 'main', }; diff --git a/scripts/deploy/publish-build-artifacts.sh b/scripts/deploy/publish-build-artifacts.sh index a7ae78522726..8ff52e1b04c6 100755 --- a/scripts/deploy/publish-build-artifacts.sh +++ b/scripts/deploy/publish-build-artifacts.sh @@ -39,7 +39,7 @@ publishPackage() { buildDir="$(pwd)/dist/releases/${packageName}" buildVersion=$(node -pe "require('./package.json').version") - branchName=${CIRCLE_BRANCH:-'master'} + branchName=${CIRCLE_BRANCH:-'main'} commitSha=$(git rev-parse --short HEAD) commitAuthorName=$(git --no-pager show -s --format='%an' HEAD) diff --git a/scripts/deploy/publish-docs-content.sh b/scripts/deploy/publish-docs-content.sh index 1a7de44bd287..b44ce831adf4 100755 --- a/scripts/deploy/publish-docs-content.sh +++ b/scripts/deploy/publish-docs-content.sh @@ -34,7 +34,7 @@ docsContentRepoUrl="https://github.com/angular/material2-docs-content" buildVersion=$(node -pe "require('./package.json').version") # Name of the branch that is currently being deployed. -branchName=${CIRCLE_BRANCH:-'master'} +branchName=${CIRCLE_BRANCH:-'main'} # Additional information about the last commit for docs-content commits. commitSha=$(git rev-parse --short HEAD)