From 40a1cb0be8b6fd36602b85a07f4b5c2c6a53a376 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Thu, 28 Apr 2022 20:31:29 +0200 Subject: [PATCH] build: changes for primary branch rename (#2623) Changes from the `DIRECT` phase of the renaming master to main planning doc. --- .circleci/config.yml | 4 ++-- .github/workflows/scorecard.yml | 2 +- .ng-dev/github.ts | 2 +- renovate.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5124c39362..c0a98cc551 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,7 +56,7 @@ jobs: setup: executor: action-executor steps: - # After checkout, rebase on top of master. By default, PRs are not rebased on top of master, + # After checkout, rebase on top of main. By default, PRs are not rebased on top of main, # which we want. See https://discuss.circleci.com/t/1662 - checkout: post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge" @@ -147,7 +147,7 @@ workflows: general: branches: only: - - master + - main # 5.2.x, 6.0.x, etc - /\d+\.\d+\.x/ # 5.x, 6.x, etc diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 6bee92ed95..89090e5165 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -4,7 +4,7 @@ on: schedule: - cron: '0 2 * * 0' push: - branches: [master] + branches: [main] workflow_dispatch: # Declare default permissions as read only. diff --git a/.ng-dev/github.ts b/.ng-dev/github.ts index 1e692dea85..07f618b721 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: 'universal', - mainBranchName: 'master', + mainBranchName: 'main', }; diff --git a/renovate.json b/renovate.json index 949a0bb3a8..926fc49503 100644 --- a/renovate.json +++ b/renovate.json @@ -9,7 +9,7 @@ "lockFileMaintenance": { "enabled": true }, - "baseBranches": ["master"], + "baseBranches": ["main"], "ignoreDeps": ["@types/node"], "includePaths": [ "WORKSPACE",