Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: changes for renaming primary branch to main #24828

Merged
merged 1 commit into from
Apr 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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