sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #6344: fix: adjust conditions in Check Merge Fast-Forward Only action

Browse Source 
8865686132 fix: adjust conditions in `Check Merge Fast-Forward Only` action (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  I _think_ we were using the wrong event name since #6190... which is why #6341 is failing atm.

  ```
  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 0172b887c0
    else
      git merge --ff-only d494339b9f
    fi

  ```
  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 `develop` https://github.com/UdjinM6/dash/commits/develop/

  Created 2 PRs to verify it worked as expected:
  - https://github.com/UdjinM6/dash/pull/18
  - https://github.com/UdjinM6/dash/pull/19

  ## Breaking Changes
  n/a

  ## 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)_

Top commit has no ACKs.

Tree-SHA512: fb38b671d072b802eda0cd012df805cfb875e537b3049ee4b254af0b2763ad12e916972509899948d71910ca439c036d63b678e26761ad111e63b65d5e824a2b
This commit is contained in:
pasta 2024-10-23 20:23:18 -05:00
commit 33de35e5e5
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/merge-check.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
run: |
git fetch origin master:master
git checkout master
if [ "${{ github.event_name }}" == "pull_request" ]; then
if [[ "${{ github.event_name }}" == "pull_request"* ]]; then
git merge --ff-only ${{ github.event.pull_request.head.sha }}
else
git merge --ff-only ${{ github.sha }}