From 296821354735f4e0f4cb6c4d44d7f3ba177a4692 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Thu, 28 Apr 2022 19:45:38 +0200 Subject: [PATCH] build: changes for renaming primary branch to `main` (#24828) Changes of the `DIRECT` phase for the "renaming master to main" migration/planning doc. (cherry picked from commit 090d40f9dec8a1f0f7175e859e8b3d85fe8e3713) --- .circleci/rebase-pr.js | 2 +- .ng-dev/github.ts | 2 +- renovate.json | 2 +- scripts/deploy/publish-build-artifacts.sh | 2 +- scripts/deploy/publish-docs-content.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/rebase-pr.js b/.circleci/rebase-pr.js index 5944d59dbe9a..813907251b16 100644 --- a/.circleci/rebase-pr.js +++ b/.circleci/rebase-pr.js @@ -157,7 +157,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 39c0203dd504..fa30687b3d7b 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: 'components', - mainBranchName: 'master', + mainBranchName: 'main', }; diff --git a/renovate.json b/renovate.json index 80adaf450efb..dfcc0ad0479a 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "automerge": false, - "baseBranches": ["master"], + "baseBranches": ["main"], "enabledManagers": ["npm", "bazel", "github-actions"], "stopUpdatingLabel": "merge ready", "labels": ["target: patch", "merge safe"], diff --git a/scripts/deploy/publish-build-artifacts.sh b/scripts/deploy/publish-build-artifacts.sh index 7c7ff81f0174..331e53c06b70 100755 --- a/scripts/deploy/publish-build-artifacts.sh +++ b/scripts/deploy/publish-build-artifacts.sh @@ -40,7 +40,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 dd68f75a6f9a..5ed198d70bce 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)