Skip to content

Commit

Permalink
build: changes for renaming primary branch to main (#24828)
Browse files Browse the repository at this point in the history
Changes of the `DIRECT` phase for the "renaming master to
main" migration/planning doc.

(cherry picked from commit 090d40f)
  • Loading branch information
devversion authored and josephperrott committed Apr 28, 2022
1 parent 0f15e12 commit 2968213
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/rebase-pr.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function getShaFromRef(ref) {
* by committerdate.
*
* example:
* upstream/master
* upstream/main
* upstream/9.0.x
* upstream/test
* upstream/1.1.x
Expand Down
2 changes: 1 addition & 1 deletion .ng-dev/github.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
};
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
@@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy/publish-build-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy/publish-docs-content.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2968213

Please sign in to comment.