Skip to content

Commit 0532037

Browse files
authored
Run ready to merge check for PRs (#928)
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.
1 parent a234385 commit 0532037

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/cargo-msrv.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
pull_request:
55
branches:
66
- master
7+
merge_group:
8+
branches:
9+
- master
710

811
concurrency:
912
# Cancels pending runs when a PR gets updated.

.github/workflows/merge-check.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Merge Check
22
on:
3+
pull_request:
4+
branches:
5+
- master
36
merge_group:
47
branches:
58
- master
@@ -16,11 +19,9 @@ jobs:
1619
# Ignore some actions (based on what merge_group triggers):
1720
# - this action
1821
# - pre code review checks for stable Rust (we allow them to fail)
19-
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"
20-
# This action uses API. We have a quota of 1000 per day.
21-
# We normally run tests within 1 hours (excluding binding tests).
22-
# If we check every 10 mins, we use roughly 6 API calls per trigger.
23-
# We can handle ~160 triggers.
22+
# - binding tests (it may take long to run)
23+
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"
24+
# This action uses API. We have a quota of 1000 per hour.
2425
checkInterval: 600
2526
env:
2627
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)