Skip to content

Conversation

@PastaPastaPasta
Copy link
Member

Issue being fixed or feature implemented

this is untested but I think it'll work, simply add comment and label to PRs which fail this CI

What was done?

How Has This Been Tested?

hasn't but if this action breaks that is not critical

Breaking Changes

None

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)

@PastaPastaPasta PastaPastaPasta modified the milestones: 22, 21.2 Aug 9, 2024
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK 5394d63

@PastaPastaPasta PastaPastaPasta merged commit 23d84c6 into dashpay:develop Aug 12, 2024
PastaPastaPasta added a commit that referenced this pull request Oct 24, 2024
…` action

8865686 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 0172b88
    else
      git merge --ff-only d494339
    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:
  - UdjinM6#18
  - UdjinM6#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
@UdjinM6 UdjinM6 modified the milestones: 21.2, 22 Oct 29, 2024
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