Skip to content

Commit 593922f

Browse files
committed
Switch FreeBSD CI builds from BuildBot to cirrus-ci.com
This change does the following: 1) Adds a CI build on cirrus-ci.com 2) Switches FreeBSD's CI from a jail to a full VM 3) Switches FreeBSD i386's CI from a 32-bit jail to simply using a cross-compiled binary on a 64-bit VM. 4) Switches FreeBSD i386's CI from using stable rust to 1.24.1 (back when I added buildbot, rustup didn't support i686-unknown-freebsd) 5) Switches bors to gate on cirrus-ci rather than buildbot This change does _not_ disable buildbot. That must happen outside of git. Fixes #996
1 parent e1bb80e commit 593922f

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

.cirrus.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
freebsd_instance:
2+
image: freebsd-11-2-release-amd64
3+
4+
# Test FreeBSD in a full VM on cirrus-ci.com. Test the i686 target too, in the
5+
# same VM. The binary will be built in 32-bit mode, but will execute on a
6+
# 64-bit kernel and in a 64-bit environment. Our tests don't execute any of
7+
# the system's binaries, so the environment shouldn't matter.
8+
task:
9+
name: FreeBSD 11.2
10+
# Install Rust
11+
setup_script:
12+
- pkg install -y curl
13+
- curl https://sh.rustup.rs -sSf --output rustup.sh
14+
- sh rustup.sh -y --default-toolchain 1.24.1
15+
- $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
16+
amd64_test_script:
17+
- . $HOME/.cargo/env
18+
- cargo test
19+
i386_test_script:
20+
- . $HOME/.cargo/env
21+
- cargo test --target i686-unknown-freebsd

bors.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Gate on Travis CI and Buildbot
22
status = ["continuous-integration/travis-ci/push",
3-
"buildbot/nix-rust/nix amd64_fbsd11",
4-
"buildbot/nix-rust/nix i386_fbsd11"]
3+
"FreeBSD 11.2"]
54

65
# Set bors's timeout to 4 hours
76
#

0 commit comments

Comments
 (0)