From e88e6b99de10f360eb912ba8f3957145ce7298a6 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Fri, 7 Dec 2018 13:03:59 -0700 Subject: Move FreeBSD testing from Travis/QEMU to Cirrus-CI Fixes #1163 --- .cirrus.yml | 14 ++++++++++++++ .travis.yml | 3 --- bors.toml | 4 ++++ ci/docker/x86_64-unknown-freebsd/Dockerfile | 13 ------------- 4 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 .cirrus.yml create mode 100644 bors.toml delete mode 100644 ci/docker/x86_64-unknown-freebsd/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml new file mode 100644 index 0000000000..3aa24af38a --- /dev/null +++ b/.cirrus.yml @@ -0,0 +1,14 @@ +freebsd_instance: + image: freebsd-11-1-release-amd64 + +task: + # This name gets reported as a build status in GitHub + name: stable x86_64-unknown-freebsd + setup_script: + - pkg install -y curl + - curl https://sh.rustup.rs -sSf --output rustup.sh + - sh rustup.sh -y + test_script: + - . $HOME/.cargo/env + - cd libc-test + - cargo test diff --git a/.travis.yml b/.travis.yml index e1f33c574e..82faa3c028 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,9 +78,6 @@ matrix: - env: TARGET=x86_64-unknown-linux-gnux32 OPT="--release" rust: nightly - # QEMU based targets that compile in an emulator - - env: TARGET=x86_64-unknown-freebsd - - env: TARGET=wasm32-unknown-unknown install: rustup target add $TARGET script: cargo build --no-default-features --target $TARGET --release diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000000..11d894572a --- /dev/null +++ b/bors.toml @@ -0,0 +1,4 @@ +# Gate on both Travis CI and Cirrus-ci +status = ["continuous-integration/appveyor/branch", + "continuous-integration/travis-ci/push", + "stable x86_64-unknown-freebsd"] diff --git a/ci/docker/x86_64-unknown-freebsd/Dockerfile b/ci/docker/x86_64-unknown-freebsd/Dockerfile deleted file mode 100644 index 35f1036575..0000000000 --- a/ci/docker/x86_64-unknown-freebsd/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM wezm/port-prebuilt-freebsd11@sha256:43553e2265ec702ec72a63a765df333f50b1858b896e69385749e96d8624e9b0 - -RUN apt-get update -RUN apt-get install -y --no-install-recommends \ - qemu genext2fs xz-utils -RUN apt-get install -y curl ca-certificates gcc - -ENTRYPOINT ["sh"] - -ENV PATH=$PATH:/rust/bin \ - QEMU=2018-03-15/FreeBSD-11.1-RELEASE-amd64.qcow2.xz \ - CAN_CROSS=1 \ - CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd11-gcc -- cgit v1.2.1 From 3f0fff5a9471312f7f2dd7a8d42d605a106b63cd Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Fri, 7 Dec 2018 13:59:55 -0700 Subject: Remove bors.toml. Per @alexcrichton it isn't needed. --- bors.toml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bors.toml diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 11d894572a..0000000000 --- a/bors.toml +++ /dev/null @@ -1,4 +0,0 @@ -# Gate on both Travis CI and Cirrus-ci -status = ["continuous-integration/appveyor/branch", - "continuous-integration/travis-ci/push", - "stable x86_64-unknown-freebsd"] -- cgit v1.2.1