Skip to content
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.

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

fix: fetch PR head before merging it in Check Merge Fast-Forward Only action #6355

Merged
merged 1 commit into from
Oct 24, 2024

Conversation

UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Oct 24, 2024

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 b216a402cc58cb153bebe137064fd0c804752d21
  else
    git merge --ff-only 3a18f087bf16fc7530b2b139a59a056320632b1f
  fi
  shell: /usr/bin/bash -e {0}
From https://github.com/dashpay/dash
 * [new branch]          master     -> master
Switched to branch 'master'
merge: b216a402cc58cb153bebe137064fd0c804752d21 - 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)

@UdjinM6 UdjinM6 added this to the 22 milestone Oct 24, 2024
Copy link

This pull request has conflicts, please rebase.

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK c3aae9e

@PastaPastaPasta PastaPastaPasta merged commit dda9b73 into dashpay:develop Oct 24, 2024
32 of 33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants