Skip to content

Commit c1fa4b6

Browse files
committed
Update FreeBSD docker CI to use FreeBSD 11.1 image
1 parent d3e6651 commit c1fa4b6

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM alexcrichton/port-prebuilt-freebsd:2017-09-16
1+
FROM wezm/port-prebuilt-freebsd11@sha256:43553e2265ec702ec72a63a765df333f50b1858b896e69385749e96d8624e9b0
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \
5-
qemu genext2fs
5+
qemu genext2fs xz-utils
66
RUN apt-get install -y curl ca-certificates gcc
77

88
ENTRYPOINT ["sh"]
99

1010
ENV PATH=$PATH:/rust/bin \
11-
QEMU=2016-11-06/freebsd.qcow2.gz \
11+
QEMU=2018-03-15/FreeBSD-11.1-RELEASE-amd64.qcow2.xz \
1212
CAN_CROSS=1 \
13-
CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-gcc
13+
CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd11-gcc

ci/run.sh

+7
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ if [ "$QEMU" != "" ]; then
2424
curl https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc/$QEMU | \
2525
gunzip -d > $tmpdir/$qemufile
2626
fi
27+
elif [ -z "${QEMU#*.xz}" ]; then
28+
# image is .xz : download and uncompress it
29+
qemufile=$(echo ${QEMU%.xz} | sed 's/\//__/g')
30+
if [ ! -f $tmpdir/$qemufile ]; then
31+
curl https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc/$QEMU | \
32+
unxz > $tmpdir/$qemufile
33+
fi
2734
else
2835
# plain qcow2 image: just download it
2936
qemufile=$(echo ${QEMU} | sed 's/\//__/g')

0 commit comments

Comments
 (0)