Skip to content

Commit

Permalink
Merge #6206: fix: 6205 follow-up
Browse files Browse the repository at this point in the history
52b9fce fix: can't mix `-` and `:` (UdjinM6)
2f12f91 fix: 6205 follow-up (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  I think I messed up whitespaces so these jobs can't run now, they fail with `[Error] Invalid type for on` https://github.com/dashpay/dash/actions/runs/10353281487...
  Weird that they succeeded in #6205 https://github.com/dashpay/dash/actions/runs/10352521500/workflow https://github.com/dashpay/dash/actions/runs/10352521490/workflow 🤷‍♂️

  ## 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 52b9fce

Tree-SHA512: f4dff14b727164c5a79545dc2650dc716eb08ddb6445d76fc70a3bdc5044d22212ce44fd942db65559154e989c0ff272d733558b1773440a88a691a222642746
  • Loading branch information
PastaPastaPasta committed Aug 13, 2024
2 parents 6ef28ca + 52b9fce commit 792c032
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ permissions:
pull-requests: write

on:
- push
- pull_request_target
- pull_request_review:
types: [submitted]
push:
pull_request_target:
pull_request_review:
types: [submitted]

jobs:
check_merge:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/predict-conflicts.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: "Check Potential Conflicts"

on:
- pull_request_target
- pull_request_review:
types: [submitted]
pull_request_target:
pull_request_review:
types: [submitted]

permissions:
contents: read
Expand Down

0 comments on commit 792c032

Please sign in to comment.