Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 7aa8242

Browse files
authored
Add more checks to mergify due to GitHub Actions migration (#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"
1 parent 0ca46c6 commit 7aa8242

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.github/workflows/pull-request.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,19 @@ env:
99
SOLANA_VERSION: v1.4.4
1010

1111
jobs:
12+
all_github_action_checks:
13+
runs-on: ubuntu-latest
14+
needs:
15+
- clippy
16+
- list_bpf_programs
17+
- cargo_test
18+
- js_token
19+
- js_token_swap
20+
- js_token_lending
21+
- build_bpf_programs
22+
- excluded_project_tests
23+
steps:
24+
- run: echo "Done"
1225
rustfmt:
1326
runs-on: ubuntu-latest
1427
steps:

.mergify.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
pull_request_rules:
77
- name: automatic merge (squash) on CI success
88
conditions:
9-
- status-success=Travis CI - Pull Request
9+
- check-success=Travis CI - Pull Request
10+
- check-success=all_github_action_checks
1011
- label=automerge
1112
- author≠@dont-squash-my-commits
1213
actions:
@@ -15,7 +16,8 @@ pull_request_rules:
1516
# Join the dont-squash-my-commits group if you won't like your commits squashed
1617
- name: automatic merge (rebase) on CI success
1718
conditions:
18-
- status-success=Travis CI - Pull Request
19+
- check-success=Travis CI - Pull Request
20+
- check-success=all_github_action_checks
1921
- label=automerge
2022
- author=@dont-squash-my-commits
2123
actions:

0 commit comments

Comments
 (0)