Skip to content

Commit 9b1f3a9

Browse files
matthewdalealcaeus
andauthored
Fix the condition to skip golang merge-up steps for dry run releses. (#99)
Co-authored-by: Andreas Braun <git@alcaeus.org>
1 parent fac300d commit 9b1f3a9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

golang/pre-publish/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ runs:
2626
version: v${{ inputs.version }}
2727
push_tag: ${{ inputs.push_changes }}
2828
- name: "Determine branch to merge up to"
29-
if: ${{ inputs.push_changes }}
29+
if: ${{ inputs.push_changes == 'true' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) }}
3030
id: get-next-branch
3131
uses: alcaeus/automatic-merge-up-action/get-next-branch@a43d2c2d3ed5a92a1fce3e3bde21c27c578f50d3 #1.0.0
3232
with:
@@ -36,7 +36,7 @@ runs:
3636
fallbackBranch: 'master'
3737
ignoredBranches: ${{ inputs.ignored_branches }}
3838
- name: "Manually merge up changes"
39-
if: ${{ inputs.push_changes && steps.get-next-branch.outputs.hasNextBranch }}
39+
if: ${{ inputs.push_changes == 'true' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) && steps.get-next-branch.outputs.hasNextBranch }}
4040
shell: bash
4141
run: |
4242
git checkout ${NEXT_BRANCH}

0 commit comments

Comments
 (0)