diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml index cb5a3df02..03f3065bb 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -28,5 +28,5 @@ jobs: with: ref: ${{ github.ref_name }} branchNamePattern: 'v.' - fallbackBranch: 'master' + devBranchNamePattern: 'v.x' enableAutoMerge: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59f41037e..88e2ccc96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -116,7 +116,7 @@ jobs: with: ref: ${{ github.ref_name }} branchNamePattern: 'v.' - fallbackBranch: 'master' + devBranchNamePattern: 'v.x' - name: "Manually merge up changes" if: ${{ steps.get-next-branch.outputs.hasNextBranch }}