diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd42e093..fa0f48ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,14 +2,12 @@ name: ci -# We want to run CI on all pull requests. Additionally, Bors needs workflows to -# run on the `staging` and `trying` branches. +# We want to run CI on all pull requests. Additionally, GitHub actions merge +# queue needs workflows to run on the `merge_queue` trigger to block merges on +# them. on: pull_request: - push: - branches: - - staging - - trying + merge_group: jobs: ci: diff --git a/.github/workflows/mac-os.yml b/.github/workflows/mac-os.yml index 3116069a..f4e785cb 100644 --- a/.github/workflows/mac-os.yml +++ b/.github/workflows/mac-os.yml @@ -2,8 +2,9 @@ name: ci-mac-os -# We run this workflow during pull request review, but not for Bors merges. We -# can change this if the workflow is reasonably quick and reliable. +# We run this workflow during pull request review, but not as a required status +# for GitHub actions merge-queue merges. We can change this if the workflow is +# reasonably quick and reliable. on: pull_request jobs: diff --git a/.github/workflows/size-diff.yml b/.github/workflows/size-diff.yml index 6989b392..b453a90b 100644 --- a/.github/workflows/size-diff.yml +++ b/.github/workflows/size-diff.yml @@ -3,14 +3,12 @@ name: size-diff -# We want to run this on all pull requests. Additionally, Bors needs workflows -# to run on the `staging` and `trying` branches to block merges on them. +# We want to run this on all pull requests. Additionally, GitHub actions merge +# queue needs workflows to run on the `merge_queue` trigger to block merges on +# them. on: pull_request: - push: - branches: - - staging - - trying + merge_group: jobs: size-diff: diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 4b9b851b..00000000 --- a/bors.toml +++ /dev/null @@ -1,4 +0,0 @@ -status = [ - "ci", - "size-diff", -]