Skip to content

Commit

Permalink
Update CI for Rust bors
Browse files Browse the repository at this point in the history
  • Loading branch information
fee1-dead authored and Veykril committed Apr 13, 2022
1 parent ac736dc commit 8b60bf6
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -6,6 +9,8 @@ on:
- master
- staging
- trying
- auto
- try

env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion crates/rust-analyzer/tests/slow-tests/tidy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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!(
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 8b60bf6

Please sign in to comment.