diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d0594dcf..b301e121 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -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: diff --git a/.mergify.yml b/.mergify.yml index 321fd0ee..a1b5f724 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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: @@ -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: