From 49f0c81097496707455ab684989c9a1bbd7dfbde Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 28 May 2025 17:23:14 +0200 Subject: [PATCH] Ignore unmaintained branches when merging up (#2062) --- .github/workflows/merge-up.yml | 3 ++- .github/workflows/release.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml index 1ba5980ade..30726ae2f2 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -27,10 +27,11 @@ jobs: - name: Create pull request id: create-pull-request - uses: alcaeus/automatic-merge-up-action@main + uses: alcaeus/automatic-merge-up-action@1.0.0 with: ref: ${{ github.ref_name }} branchNamePattern: 'release/.' devBranchNamePattern: 'v' fallbackBranch: 'master' + ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }} enableAutoMerge: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec586ceca2..dcd0acdde7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,6 +49,7 @@ jobs: with: version: ${{ inputs.version }} push_changes: ${{ inputs.push_changes }} + ignored_branches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }} static-scan: needs: [pre-publish]