diff options
| -rw-r--r-- | .github/workflows/ci.yaml | 23 | ||||
| -rw-r--r-- | crates/rust-analyzer/tests/slow-tests/tidy.rs | 2 | ||||
| -rw-r--r-- | docs/dev/README.md | 2 |
3 files changed, 25 insertions, 2 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d1048bd3549..feb6cc95ac7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,3 +1,6 @@ +# Please make sure that the `needs` fields for both `end-success` and `end-failure` +# are updated when adding new jobs! + name: CI on: pull_request: @@ -6,6 +9,8 @@ on: - master - staging - trying + - auto + - try env: CARGO_INCREMENTAL: 0 @@ -150,3 +155,21 @@ jobs: - run: npm run package --scripts-prepend-node-path working-directory: ./editors/code + + end-success: + name: bors build finished + if: github.event.pusher.name == 'bors' && success() + runs-on: ubuntu-latest + needs: [rust, rust-cross, typescript] + steps: + - name: Mark the job as successful + run: exit 0 + + end-failure: + name: bors build finished + if: github.event.pusher.name == 'bors' && (failure() || cancelled()) + runs-on: ubuntu-latest + needs: [rust, rust-cross, typescript] + steps: + - name: Mark the job as a failure + run: exit 1 diff --git a/crates/rust-analyzer/tests/slow-tests/tidy.rs b/crates/rust-analyzer/tests/slow-tests/tidy.rs index 1d04caa28a9..4a2f45fd51f 100644 --- a/crates/rust-analyzer/tests/slow-tests/tidy.rs +++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs @@ -146,7 +146,7 @@ fn check_cargo_toml(path: &Path, text: String) { fn check_merge_commits() { let sh = &Shell::new().unwrap(); - let bors = cmd!(sh, "git rev-list --merges --author 'bors\\[bot\\]' HEAD~19..").read().unwrap(); + let bors = cmd!(sh, "git rev-list --merges --author 'bors' HEAD~19..").read().unwrap(); let all = cmd!(sh, "git rev-list --merges HEAD~19..").read().unwrap(); if bors != all { panic!( diff --git a/docs/dev/README.md b/docs/dev/README.md index 8d4d1d7a252..4a047e57a00 100644 --- a/docs/dev/README.md +++ b/docs/dev/README.md @@ -66,7 +66,7 @@ If `cargo test` passes locally, that's a good sign that CI will be green as well The only exception is that some long-running tests are skipped locally by default. Use `env RUN_SLOW_TESTS=1 cargo test` to run the full suite. -We use bors-ng to enforce the [not rocket science](https://graydon2.dreamwidth.org/1597.html) rule. +We use bors to enforce the [not rocket science](https://graydon2.dreamwidth.org/1597.html) rule. ## Launching rust-analyzer |