Skip to content

Commit

Permalink
Merge #1264
Browse files Browse the repository at this point in the history
1264: Update the FreeBSD test image to 11.4-release r=asomers a=asomers

And temporarily disable travis targets

Co-authored-by: Alan Somers <[email protected]>
  • Loading branch information
bors[bot] and asomers authored Jul 3, 2020
2 parents c18b1d0 + 3e52d09 commit 679c786
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion bors.toml
Original file line number Diff line number Diff line change
@@ -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
#
Expand Down

0 comments on commit 679c786

Please sign in to comment.