diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ee452016d..a25c1367e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,9 +1,5 @@ name: CI -on: - push: - branches: - - staging - - trying +on: merge_group jobs: @@ -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 diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1c11ef038..5d165324f 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -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 diff --git a/Cargo.toml b/Cargo.toml index 7bc9371d1..bd019dbc9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 22967b5dd..000000000 --- a/bors.toml +++ /dev/null @@ -1,17 +0,0 @@ -status = [ - "Check (1.63.0)", - "Test (ubuntu-latest, stable)", - "Test (ubuntu-latest, stable-i686)", - "Test (ubuntu-latest, beta)", - "Test (ubuntu-latest, nightly)", - "Test (windows-latest, stable)", - "Test (windows-latest, beta)", - "Test (windows-latest, nightly)", - "Test (macos-latest, stable)", - "Test (macos-latest, beta)", - "Test (macos-latest, nightly)", - "Demo (stable)", - "Demo (nightly)", - "WebAssembly", - "Format", -]