Merge #1264

1264: Update the FreeBSD test image to 11.4-release r=asomers a=asomers

And temporarily disable travis targets

Co-authored-by: Alan Somers <asomers@gmail.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index 05407496..3591c0e5 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,12 +1,12 @@
 freebsd_instance:
-  image_family: freebsd-11-3-snap
+  image: freebsd-11-4-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.3
+  name: FreeBSD 11.4
   cargo_cache:
     folder: $CARGO_HOME/registry
     fingerprint_script: cat Cargo.lock || echo ""
diff --git a/bors.toml b/bors.toml
index 04732bfd..1a0ec6f8 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,6 +1,6 @@
 # Gate on Travis CI and Buildbot
 status = ["continuous-integration/travis-ci/push",
-	  "FreeBSD 11.3"]
+	  "FreeBSD 11.4"]
 
 # Set bors's timeout to 4 hours
 #