Skip to content

Commit 8b60bf6

Browse files
fee1-deadVeykril
authored andcommitted
Update CI for Rust bors
1 parent ac736dc commit 8b60bf6

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

.github/workflows/ci.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Please make sure that the `needs` fields for both `end-success` and `end-failure`
2+
# are updated when adding new jobs!
3+
14
name: CI
25
on:
36
pull_request:
@@ -6,6 +9,8 @@ on:
69
- master
710
- staging
811
- trying
12+
- auto
13+
- try
914

1015
env:
1116
CARGO_INCREMENTAL: 0
@@ -150,3 +155,21 @@ jobs:
150155

151156
- run: npm run package --scripts-prepend-node-path
152157
working-directory: ./editors/code
158+
159+
end-success:
160+
name: bors build finished
161+
if: github.event.pusher.name == 'bors' && success()
162+
runs-on: ubuntu-latest
163+
needs: [rust, rust-cross, typescript]
164+
steps:
165+
- name: Mark the job as successful
166+
run: exit 0
167+
168+
end-failure:
169+
name: bors build finished
170+
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
171+
runs-on: ubuntu-latest
172+
needs: [rust, rust-cross, typescript]
173+
steps:
174+
- name: Mark the job as a failure
175+
run: exit 1

crates/rust-analyzer/tests/slow-tests/tidy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ fn check_cargo_toml(path: &Path, text: String) {
146146
fn check_merge_commits() {
147147
let sh = &Shell::new().unwrap();
148148

149-
let bors = cmd!(sh, "git rev-list --merges --author 'bors\\[bot\\]' HEAD~19..").read().unwrap();
149+
let bors = cmd!(sh, "git rev-list --merges --author 'bors' HEAD~19..").read().unwrap();
150150
let all = cmd!(sh, "git rev-list --merges HEAD~19..").read().unwrap();
151151
if bors != all {
152152
panic!(

docs/dev/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ If `cargo test` passes locally, that's a good sign that CI will be green as well
6666
The only exception is that some long-running tests are skipped locally by default.
6767
Use `env RUN_SLOW_TESTS=1 cargo test` to run the full suite.
6868

69-
We use bors-ng to enforce the [not rocket science](https://graydon2.dreamwidth.org/1597.html) rule.
69+
We use bors to enforce the [not rocket science](https://graydon2.dreamwidth.org/1597.html) rule.
7070

7171
## Launching rust-analyzer
7272

0 commit comments

Comments
 (0)