summaryrefslogtreecommitdiff
path: root/bors.toml
diff options
context:
space:
mode:
authorAlan Somers <asomers@gmail.com>2020-12-02 17:47:35 -0700
committerAlan Somers <asomers@gmail.com>2020-12-06 22:35:30 -0700
commitbf7a5fd606ba48c789bdaf95da2779e46e5f83c6 (patch)
tree5ff9c603b744eff0c5d1763df5220a661087bb5f /bors.toml
parenta1eb89568e50132339b5e8a1d5166fb5b5f9b0e8 (diff)
downloadnix-bf7a5fd606ba48c789bdaf95da2779e46e5f83c6.zip
Switch all builds from Travis to Cirrus
Travis has been super-slow lately (> 6 hours per build). Cirrus is much faster: about 20 minutes. Cirrus also has slightly better test coverage, mainly because it doesn't use SECCOMP. Also, * Fix the Redox CI build. The old Travis configuration didn't actually build for Redox, so we never noticed that Redox can't be built with a stable compiler. Thanks to @coolreader18 for finding this. * Disable the udp_offload tests on cross-tested platforms. These tests are failing with ENOPROTOOPT in Cirrus-CI. I suspect it's due to a lack of support in QEMU. These tests were skipped on Travis because its kernel was too old. * Fix require_kernel_version on Cirrus-CI. Cirrus reports the Linux kernel version as 4.19.112+, which the semver crate can't handle. * Fix test_setfsuid on Cirrus. When run on Cirrus, it seems like the file in /tmp gets deleted as soon as it's closed. Probably an overzealous temporary file cleaner. Use /var/tmp, because no temporary file cleaner should run in there. * Skip mount tests on Cirrus. They fail for an unknown reason. Issue #1351 * Skip the AF_ALG tests on Cirrus-CI Issue #1352
Diffstat (limited to 'bors.toml')
-rw-r--r--bors.toml51
1 files changed, 40 insertions, 11 deletions
diff --git a/bors.toml b/bors.toml
index 1a0ec6f8..e36dabda 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,16 +1,45 @@
# Gate on Travis CI and Buildbot
-status = ["continuous-integration/travis-ci/push",
- "FreeBSD 11.4"]
+status = [
+ "FreeBSD amd64 & i686",
+ "OSX x86_64",
+ "OSX i686",
+ "iOS",
+ "Linux aarch64",
+ "Linux arm gnueabi",
+ "Linux armv7 gnueabihf",
+ "Linux i686",
+ "Linux i686 musl",
+ "Linux MIPS",
+ "Linux MIPS64",
+ "Linux MIPS64 el",
+ "Linux mipsel",
+ "Linux powerpc64le",
+ "Rust Stable",
+ "Linux x86_64",
+ "Linux x86_64 musl",
+ "Android aarch64",
+ "Android arm",
+ "Android armv7",
+ "Android i686",
+ "Android x86_64",
+ "Linux arm-musleabi",
+ "Linux powerpc",
+ "Linux s390x",
+ "Linux s390x",
+ "NetBSD x86_64",
+ "Redox x86_64",
+ "Minver",
+]
-# Set bors's timeout to 4 hours
+# Set bors's timeout to 1 hour
#
-# bors's timeout should always be twice a long as the test suite takes.
-# This is to allow Travis to fast-fail a test; if one of the builders
+# bors's timeout should always be at least twice as long as the test suite
+# takes. This is to allow Travis to fast-fail a test; if one of the builders
# immediately reports a failure, then bors will move on to the next batch,
-# leaving the slower builders to work through the already-doomed run and
-# the next one.
+# leaving the slower builders to work through the already-doomed run and the
+# next one.
#
-# At the time this was written, nix's test suite took about an hour to run.
-# The timeout was raised to four hours, instead of two, to give nix room
-# to grow and time for delays on Travis's end.
-timeout_sec = 14400
+# At the time this was written, nix's test suite took about twenty minutes to
+# run. The timeout was raised to one hour to give nix room to grow and time
+# for delays on Cirrus's end.
+timeout_sec = 3600