From ea267013a7b9b95697d9c14017d4cf76aa2e8db4 Mon Sep 17 00:00:00 2001 From: Amit Dahan Date: Tue, 24 Oct 2023 08:56:45 +0300 Subject: [PATCH 1/2] Point Renovate to `main` branch instead of `master` --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 4cfe8f1b..aeaa6bb3 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": ["config:base", ":preserveSemverRanges"], - "baseBranches": ["master", "next"], + "baseBranches": ["main", "next"], "postUpdateOptions": ["yarnDedupeHighest"] } From b81f8f9f8f9499d7d5bfb6576203bcb6cdfcf115 Mon Sep 17 00:00:00 2001 From: Amit Dahan Date: Tue, 24 Oct 2023 08:57:33 +0300 Subject: [PATCH 2/2] Use `main` instead of `master` for CI --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18c4328a..86b92bc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,11 +1,11 @@ on: pull_request: branches: - - master + - main - next push: branches: - - master + - main - next jobs: