Skip to content

Commit 3ea66ad

Browse files
committed
Switch Linux/GNU x86_64 tests from Travis to Cirrus
Hopefully this will get us more up-to-date VMs.
1 parent de9ae7d commit 3ea66ad

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

.cirrus.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
freebsd_instance:
2-
image: freebsd-11-2-release-amd64
3-
41
# Test FreeBSD in a full VM on cirrus-ci.com. Test the i686 target too, in the
52
# same VM. The binary will be built in 32-bit mode, but will execute on a
63
# 64-bit kernel and in a 64-bit environment. Our tests don't execute any of
@@ -10,6 +7,8 @@ task:
107
cargo_cache:
118
folder: $CARGO_HOME/registry
129
fingerprint_script: cat Cargo.lock || echo ""
10+
freebsd_instance:
11+
image: freebsd-11-2-release-amd64
1312
# Install Rust
1413
setup_script:
1514
- pkg install -y curl
@@ -23,3 +22,22 @@ task:
2322
- . $HOME/.cargo/env
2423
- cargo test --target i686-unknown-freebsd
2524
before_cache_script: rm -rf $CARGO_HOME/registry/index
25+
26+
task:
27+
name: Linux/GNU x86_64
28+
container:
29+
matrix:
30+
- image: rust:1.24.1
31+
- image: rust:latest
32+
cargo_cache:
33+
folder: $CARGO_HOME/registry
34+
fingerprint_script: cat Cargo.lock || echo ""
35+
setup_script:
36+
- uname -a
37+
- cat /etc/debian_version
38+
build_script:
39+
- cargo build
40+
- cargo build --release
41+
test_script:
42+
- cargo test
43+
- cargo test --release

.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ matrix:
7272
rust: 1.24.1
7373
- env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1
7474
rust: 1.24.1
75-
- env: TARGET=x86_64-unknown-linux-gnu
76-
rust: 1.24.1
75+
# Linux/GNU x86_64 uses Cirrus instead of Travis
7776
- env: TARGET=x86_64-unknown-linux-musl
7877
rust: 1.24.1
7978

@@ -84,10 +83,6 @@ matrix:
8483
- env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
8584
rust: 1.24.1
8685

87-
# Make sure stable is always working too
88-
- env: TARGET=x86_64-unknown-linux-gnu
89-
rust: stable
90-
9186
before_install: set -e
9287

9388
install:

bors.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Gate on Travis CI and Buildbot
22
status = ["continuous-integration/travis-ci/push",
3-
"FreeBSD 11.2"]
3+
"FreeBSD 11.2",
4+
"Linux/GNU x86_64"]
45

56
# Set bors's timeout to 4 hours
67
#

0 commit comments

Comments
 (0)