From 42e60bf9e507152f6cde1d3bf004df96b65e1946 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 23:10:11 +0000 Subject: [PATCH 1/2] chore(deps): update actions/checkout action to v4 --- .github/workflows/sync-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-branch.yml b/.github/workflows/sync-branch.yml index a7f00ae..061b2b8 100644 --- a/.github/workflows/sync-branch.yml +++ b/.github/workflows/sync-branch.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Sync branch main to next uses: devmasx/merge-branch@1.4.0 From 20338115c82b734e2782ce43c5c0eb08cea2b6e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeffrey=20Bo=CC=88hm?= Date: Tue, 13 Aug 2024 11:48:23 +0200 Subject: [PATCH 2/2] chore(renovate): manage the base branch only --- .github/workflows/sync-branch.yml | 4 ++-- renovate.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync-branch.yml b/.github/workflows/sync-branch.yml index 061b2b8..800f5cc 100644 --- a/.github/workflows/sync-branch.yml +++ b/.github/workflows/sync-branch.yml @@ -15,7 +15,7 @@ jobs: - name: Sync branch main to next uses: devmasx/merge-branch@1.4.0 with: - from_branch: 'main' - target_branch: 'next' + from_branch: main + target_branch: next type: now github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/renovate.json b/renovate.json index 8b06b70..ac85214 100644 --- a/renovate.json +++ b/renovate.json @@ -10,7 +10,6 @@ "datasourceTemplate": "github-releases" } ], - "baseBranches": ["main", "next"], "packageRules": [ { "matchUpdateTypes": [