Merge #6206: fix: 6205 follow-up

52b9fcecb4 fix: can't mix `-` and `:` (UdjinM6)
2f12f91d39 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 52b9fcecb4

Tree-SHA512: f4dff14b727164c5a79545dc2650dc716eb08ddb6445d76fc70a3bdc5044d22212ce44fd942db65559154e989c0ff272d733558b1773440a88a691a222642746
This commit is contained in:
pasta 2024-08-13 21:11:03 +07:00
commit 792c0320ba
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
2 changed files with 8 additions and 7 deletions

View File

@ -4,10 +4,10 @@ permissions:
pull-requests: write pull-requests: write
on: on:
- push push:
- pull_request_target pull_request_target:
- pull_request_review: pull_request_review:
types: [submitted] types: [submitted]
jobs: jobs:
check_merge: check_merge:

View File

@ -1,8 +1,9 @@
name: "Check Potential Conflicts" name: "Check Potential Conflicts"
on: on:
- pull_request_target pull_request_target:
- pull_request_review: pull_request_review:
types: [submitted] types: [submitted]
permissions: permissions:
contents: read contents: read