diff options
| author | Alan Somers <asomers@gmail.com> | 2018-12-07 13:03:59 -0700 |
|---|---|---|
| committer | Alan Somers <asomers@gmail.com> | 2018-12-07 13:11:09 -0700 |
| commit | e88e6b99de10f360eb912ba8f3957145ce7298a6 (patch) | |
| tree | 5810cec05aea5bf4464aea634efeb301436ad04c | |
| parent | f5fa41603d1a6ca141ee1cb107ca816c7892a25b (diff) | |
| download | rust-libc-e88e6b99de10f360eb912ba8f3957145ce7298a6.tar.gz | |
Move FreeBSD testing from Travis/QEMU to Cirrus-CI
Fixes #1163
| -rw-r--r-- | .cirrus.yml | 14 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | bors.toml | 4 | ||||
| -rw-r--r-- | ci/docker/x86_64-unknown-freebsd/Dockerfile | 13 |
4 files changed, 18 insertions, 16 deletions
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 |