Skip to content

Commit

Permalink
Run ready to merge check for PRs (#928)
Browse files Browse the repository at this point in the history
This PR does two changes:
* Run msrv check for merge group. We want this test to pass in order to
merge a PR.
* Run ready-to-merge check for pull requests. As we want to set
`ready-to-merge` as the required check for merging, we have to run this
check for a PR.
  • Loading branch information
qinsoon authored Aug 30, 2023
1 parent a234385 commit 0532037
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/cargo-msrv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
pull_request:
branches:
- master
merge_group:
branches:
- master

concurrency:
# Cancels pending runs when a PR gets updated.
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Merge Check
on:
pull_request:
branches:
- master
merge_group:
branches:
- master
Expand All @@ -16,11 +19,9 @@ jobs:
# Ignore some actions (based on what merge_group triggers):
# - this action
# - pre code review checks for stable Rust (we allow them to fail)
ignoreActions: "ready-to-merge,pre-code-review-checks/x86_64-unknown-linux-gnu/stable,pre-code-review-checks/i686-unknown-linux-gnu/stable,pre-code-review-checks/x86_64-apple-darwin/stable"
# This action uses API. We have a quota of 1000 per day.
# We normally run tests within 1 hours (excluding binding tests).
# If we check every 10 mins, we use roughly 6 API calls per trigger.
# We can handle ~160 triggers.
# - binding tests (it may take long to run)
ignoreActions: "ready-to-merge,check-public-api-changes,pre-code-review-checks/x86_64-unknown-linux-gnu/stable,pre-code-review-checks/i686-unknown-linux-gnu/stable,pre-code-review-checks/x86_64-apple-darwin/stable,v8-binding-test,openjdk-binding-test,jikesrvm-binding-test,julia-binding-test,ruby-binding-test"
# This action uses API. We have a quota of 1000 per hour.
checkInterval: 600
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

0 comments on commit 0532037

Please sign in to comment.