From 5818334a9a3d72a9d1b1690d50e798a6b10d677c Mon Sep 17 00:00:00 2001 From: Dylan Page Date: Sun, 5 Nov 2023 23:20:15 -0500 Subject: [PATCH] fix(renovate): add release branches to renovate (#3924) * fix(renovate): This fixes renovate to also autoMerge fixes to our release branches so we don't have to cherry-pick them. * fix(renovate): run config validator on release branches too --- .github/renovate.json5 | 1 + .github/workflows/renovate-config.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 3236c6cd7c..1d9b1c1bb9 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -6,6 +6,7 @@ commitMessageSuffix: " in {{packageFile}}", dependencyDashboardAutoclose: true, automerge: true, + baseBranches: ["main", "/^release\-.*/"], platformAutomerge: true, labels: ["dependencies"], postUpdateOptions: [ diff --git a/.github/workflows/renovate-config.yml b/.github/workflows/renovate-config.yml index b41002086a..bb5258df99 100644 --- a/.github/workflows/renovate-config.yml +++ b/.github/workflows/renovate-config.yml @@ -6,6 +6,7 @@ on: - '.github/renovate.json5' branches: - main + - 'releases-**' pull_request: paths: - '.github/renovate.json5' @@ -13,7 +14,7 @@ on: jobs: validate: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4