Skip to content

Commit 683d34d

Browse files
authored
CI: Add status-failure and status-pending check to be sure that all steps are run (solana-labs#1966)
* Test automerge with `all_github_action_checks` twice * Add status-failure=0 and status-pending=0 on mergify * status-pending doesn't exist, use status-neutral
1 parent 16c2211 commit 683d34d

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.mergify.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ pull_request_rules:
1717
conditions:
1818
- check-success=Travis CI - Pull Request
1919
- check-success=all_github_action_checks
20+
- "#status-failure=0"
21+
- "#status-neutral=0"
2022
- label=automerge
2123
- author≠@dont-squash-my-commits
2224
actions:
@@ -27,6 +29,8 @@ pull_request_rules:
2729
conditions:
2830
- check-success=Travis CI - Pull Request
2931
- check-success=all_github_action_checks
32+
- "#status-failure=0"
33+
- "#status-neutral=0"
3034
- label=automerge
3135
- author=@dont-squash-my-commits
3236
actions:

token/js/cli/token-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ export async function failOnApproveOverspend(): Promise<void> {
365365
const delegate = Keypair.generate();
366366

367367
await testToken.transfer(testAccount, account1, testAccountOwner, [], 10);
368-
369368
await testToken.approve(account1, delegate.publicKey, owner, [], 2);
370369

371370
let account1Info = await testToken.getAccountInfo(account1);

0 commit comments

Comments
 (0)