Skip to content

Commit

Permalink
Prepare repo for enabling merge queue
Browse files Browse the repository at this point in the history
  • Loading branch information
celinval committed Dec 6, 2024
1 parent e70a892 commit 66c4890
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
name: Build Book
on:
workflow_dispatch:
merge_group:
pull_request:
branches: [ main ]
push:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/kani.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Kani

on:
workflow_dispatch:
merge_group:
pull_request:
branches: [ main ]
push:
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/pr_approval.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# This workflow checks that the PR has been approved by 2+ members of the committee listed in `pull_requests.toml`.
# Run this pull request when a request review is submitted / dismissed.
# Note that an approval can be dismissed, and this can affect the job status.
# We currently trust that contributors won't make significant changes to their PRs after approval, so we accept
# changes after approval.
name: Check PR Approvals

# For now, the workflow gets triggered only when a review is submitted
# This technically means, a PR with zero approvals can be merged by the rules of this workflow alone
# To protect against that scenario, we can turn on number of approvals required to 2 in the github settings
# of the repository
on:
merge_group:
pull_request:
pull_request_review:
types: [submitted]
types: [submitted, dismissed]

jobs:
check-approvals:
Expand All @@ -20,6 +22,7 @@ jobs:

- name: Check PR Relevance and Approvals
uses: actions/github-script@v6
if: ${{ github.event_name != 'merge_group' }}
with:
script: |
const fs = require('fs');
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rustc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
name: Rust Tests
on:
workflow_dispatch:
merge_group:
pull_request:
branches: [ main ]
push:
Expand Down

0 comments on commit 66c4890

Please sign in to comment.