fix: adjust conditions in Check Merge Fast-Forward Only action
#6344
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has conflicts, please rebase. |
UdjinM6
force-pushed
the
fix_merge_check
branch
from
b6d7af5 to
6d02526
Compare
5 tasks
UdjinM6
force-pushed
the
fix_merge_check
branch
from
6d02526 to
8865686
Compare
5 tasks
PastaPastaPasta
added a commit
that referenced
this pull request
Oct 24, 2024
…t-Forward Only` action c3aae9e fix: fetch PR head before merging it in "check ff" (UdjinM6) Pull request description: ## Issue being fixed or feature implemented ``` v Run git fetch origin master:master git fetch origin master:master git checkout master if [[ "pull_request_target" == "pull_request"* ]]; then git merge --ff-only b216a40 else git merge --ff-only 3a18f08 fi shell: /usr/bin/bash -e {0} From https://github.com/dashpay/dash * [new branch] master -> master Switched to branch 'master' merge: b216a40 - not something we can merge Error: Process completed with exit code 1. ``` https://github.com/dashpay/dash/actions/runs/11492009432/job/31999602262?pr=6346 So it's picking the right commit sha now but it has no commit itself. #6344 follow-up ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK c3aae9e Tree-SHA512: 6a50d3ad40ac54aa919e970b9509e78aa61dbdfc9211e8837b5bf470ee8f0b1b68f53d082d04e8e6f375bd0bb62d92951f69cde5985b6fd1482a0cd531abf8ba
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue being fixed or feature implemented
I think we were using the wrong event name since #6190... which is why #6341 is failing atm.
https://github.com/dashpay/dash/actions/runs/11474383519/job/31930192140?pr=6341
What was done?
How Has This Been Tested?
Pushed these changes to my
develophttps://github.com/UdjinM6/dash/commits/develop/Created 2 PRs to verify it worked as expected:
Breaking Changes
n/a
Checklist: