From 593922fb60b41c7c59f2601e32f445c09fb2bcb7 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Sat, 29 Dec 2018 12:54:46 -0700
Subject: [PATCH] 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
---
 .cirrus.yml | 21 +++++++++++++++++++++
 bors.toml   |  3 +--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 .cirrus.yml

diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 0000000000..e8fddcfd21
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,21 @@
+freebsd_instance:
+  image: freebsd-11-2-release-amd64
+
+# Test FreeBSD in a full VM on cirrus-ci.com.  Test the i686 target too, in the
+# same VM.  The binary will be built in 32-bit mode, but will execute on a
+# 64-bit kernel and in a 64-bit environment.  Our tests don't execute any of
+# the system's binaries, so the environment shouldn't matter.
+task:
+  name: FreeBSD 11.2
+  # Install Rust
+  setup_script:
+    - pkg install -y curl
+    - curl https://sh.rustup.rs -sSf --output rustup.sh
+    - sh rustup.sh -y --default-toolchain 1.24.1
+    - $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
+  amd64_test_script:
+    - . $HOME/.cargo/env
+    - cargo test
+  i386_test_script:
+    - . $HOME/.cargo/env
+    - cargo test --target i686-unknown-freebsd
diff --git a/bors.toml b/bors.toml
index 3151bf821c..e145bc7fdb 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,7 +1,6 @@
 # Gate on Travis CI and Buildbot
 status = ["continuous-integration/travis-ci/push",
-          "buildbot/nix-rust/nix amd64_fbsd11",
-          "buildbot/nix-rust/nix i386_fbsd11"]
+	  "FreeBSD 11.2"]
 
 # Set bors's timeout to 4 hours
 #