Skip to content

Commit

Permalink
Merge pull request #1109 from rayon-rs/good-night-bors
Browse files Browse the repository at this point in the history
Switch from Bors-NG to GitHub merge queues
  • Loading branch information
cuviper authored Dec 13, 2023
2 parents d1b18e6 + 634cd7c commit 10c3a04
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 23 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: CI
on:
push:
branches:
- staging
- trying
on: merge_group

jobs:

Expand Down Expand Up @@ -93,3 +89,10 @@ jobs:
with:
components: rustfmt
- run: cargo fmt --all --check

done:
name: Complete
runs-on: ubuntu-latest
needs: [check, test, demo, i686, wasm, fmt]
steps:
- run: exit 0
7 changes: 7 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@ jobs:
with:
components: rustfmt
- run: cargo fmt --all --check

done:
name: Complete
runs-on: ubuntu-latest
needs: [check, test, fmt]
steps:
- run: exit 0
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation = "https://docs.rs/rayon/"
readme = "README.md"
keywords = ["parallel", "thread", "concurrency", "join", "performance"]
categories = ["concurrency"]
exclude = ["/ci/*", "/scripts/*", "/.github/*", "/bors.toml"]
exclude = ["/ci/*", "/scripts/*", "/.github/*"]

[workspace]
members = ["rayon-demo", "rayon-core"]
Expand Down
17 changes: 0 additions & 17 deletions bors.toml

This file was deleted.

0 comments on commit 10c3a04

Please sign in to comment.