Skip to content

Fix the condition to skip golang merge-up steps for dry run releses. #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix the condition to skip golang merge-up steps for dry run releses. #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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' }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if: ${{ inputs.push_changes == 'true' }}
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' && steps.get-next-branch.outputs.hasNextBranch }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if: ${{ inputs.push_changes == 'true' && 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