Skip to content

Commit d922c72

Browse files
authored
Merge pull request #1359 from asomers/no_travis_badge
[skip ci] Update docs and build badges for the Travis -> Cirrus move
2 parents 670a78b + 0143165 commit d922c72

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,21 @@ add a test that would have failed without the fix.
7676

7777
After you've made your change, make sure the tests pass in your development
7878
environment. We also have [continuous integration set up on
79-
Travis-CI][travis-ci], which might find some issues on other platforms. The CI
79+
Cirrus-CI][cirrus-ci], which might find some issues on other platforms. The CI
8080
will run once you open a pull request.
8181

8282
There is also infrastructure for running tests for other targets
8383
locally. More information is available in the [CI Readme][ci-readme].
8484

85-
[travis-ci]: https://travis-ci.org/nix-rust/nix
85+
[cirrus-ci]: https://cirrus-ci.com/github/nix-rust/nix
8686
[ci-readme]: ci/README.md
8787

8888
### Disabling a test in the CI environment
8989

9090
Sometimes there are features that cannot be tested in the CI environment.
91-
To stop a test from running under CI, add `#[cfg_attr(travis, ignore)]`
92-
to it. Please include a comment describing the reason it shouldn't run
93-
under CI, and a link to an upstream issue if possible!
91+
To stop a test from running under CI, add `skip_if_cirrus!()` to it. Please
92+
describe the reason it shouldn't run under CI, and a link to an issue if
93+
possible!
9494

9595
## bors, the bot who merges all the PRs
9696

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "MIT"
99
categories = ["os::unix-apis"]
1010
exclude = [
1111
"/.gitignore",
12-
"/.travis.yml",
12+
"/.cirrus.yml",
1313
"/ci/*",
1414
"/Cross.toml",
1515
"/RELEASE_PROCEDURE.md",

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Rust bindings to *nix APIs
22

3-
[![Travis Build Status](https://travis-ci.org/nix-rust/nix.svg?branch=master)](https://travis-ci.org/nix-rust/nix)
43
[![Cirrus Build Status](https://api.cirrus-ci.com/github/nix-rust/nix.svg)](https://cirrus-ci.com/github/nix-rust/nix)
54
[![crates.io](http://meritbadge.herokuapp.com/nix)](https://crates.io/crates/nix)
65

bors.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Gate on Travis CI and Buildbot
21
status = [
32
"FreeBSD amd64 & i686",
43
"OSX x86_64",
@@ -34,10 +33,10 @@ status = [
3433
# Set bors's timeout to 1 hour
3534
#
3635
# bors's timeout should always be at least twice as long as the test suite
37-
# takes. This is to allow Travis to fast-fail a test; if one of the builders
38-
# immediately reports a failure, then bors will move on to the next batch,
39-
# leaving the slower builders to work through the already-doomed run and the
40-
# next one.
36+
# takes. This is to allow the CI provider to fast-fail a test; if one of the
37+
# builders immediately reports a failure, then bors will move on to the next
38+
# batch, leaving the slower builders to work through the already-doomed run and
39+
# the next one.
4140
#
4241
# At the time this was written, nix's test suite took about twenty minutes to
4342
# run. The timeout was raised to one hour to give nix room to grow and time

0 commit comments

Comments
 (0)