From c20a6910350c38be97f8dfc30e2cc3033483a93b Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 27 May 2025 13:53:06 +0200 Subject: [PATCH] Ignore branches that are no longer maintained when merging up (#1838) --- .github/workflows/merge-up.yml | 3 ++- .github/workflows/release.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml index 0ad47c1c2..aee665ea2 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -24,9 +24,10 @@ 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: 'v.' devBranchNamePattern: 'v.x' + ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }} enableAutoMerge: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5267ad7a7..bd657e663 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -112,11 +112,12 @@ jobs: - name: "Determine branch to merge up to" id: get-next-branch - uses: alcaeus/automatic-merge-up-action/get-next-branch@main + uses: alcaeus/automatic-merge-up-action/get-next-branch@1.0.0 with: ref: ${{ github.ref_name }} branchNamePattern: 'v.' devBranchNamePattern: 'v.x' + ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }} - name: "Manually merge up changes" if: ${{ steps.get-next-branch.outputs.hasNextBranch }}