Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions golang/pre-publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ runs:
version: v${{ inputs.version }}
push_tag: ${{ inputs.push_changes }}
- name: "Determine branch to merge up to"
if: ${{ inputs.push_changes }}
if: ${{ inputs.push_changes == 'true' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) }}
id: get-next-branch
uses: alcaeus/automatic-merge-up-action/get-next-branch@a43d2c2d3ed5a92a1fce3e3bde21c27c578f50d3 #1.0.0
with:
Expand All @@ -36,7 +36,7 @@ runs:
fallbackBranch: 'master'
ignoredBranches: ${{ inputs.ignored_branches }}
- name: "Manually merge up changes"
if: ${{ inputs.push_changes && steps.get-next-branch.outputs.hasNextBranch }}
if: ${{ inputs.push_changes == 'true' && ! contains(fromJSON(inputs.ignored_branches), github.ref_name) && steps.get-next-branch.outputs.hasNextBranch }}
shell: bash
run: |
git checkout ${NEXT_BRANCH}
Expand Down
Loading