Skip to content

Commit

Permalink
Add more checks to mergify due to GitHub Actions migration (solana-la…
Browse files Browse the repository at this point in the history
…bs#777)

* Add more checks to mergify

* Add "rollup" GitHub action

* Add "step" to rollup action

* Update mergify for new rollup step

* Update rollup step name to "all_github_action_checks"
  • Loading branch information
joncinque authored Nov 2, 2020
1 parent 0ca46c6 commit 7aa8242
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ env:
SOLANA_VERSION: v1.4.4

jobs:
all_github_action_checks:
runs-on: ubuntu-latest
needs:
- clippy
- list_bpf_programs
- cargo_test
- js_token
- js_token_swap
- js_token_lending
- build_bpf_programs
- excluded_project_tests
steps:
- run: echo "Done"
rustfmt:
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 4 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
pull_request_rules:
- name: automatic merge (squash) on CI success
conditions:
- status-success=Travis CI - Pull Request
- check-success=Travis CI - Pull Request
- check-success=all_github_action_checks
- label=automerge
- author≠@dont-squash-my-commits
actions:
Expand All @@ -15,7 +16,8 @@ pull_request_rules:
# Join the dont-squash-my-commits group if you won't like your commits squashed
- name: automatic merge (rebase) on CI success
conditions:
- status-success=Travis CI - Pull Request
- check-success=Travis CI - Pull Request
- check-success=all_github_action_checks
- label=automerge
- author=@dont-squash-my-commits
actions:
Expand Down

0 comments on commit 7aa8242

Please sign in to comment.