diff --git a/.travis.yml b/.travis.yml index 0a50bdf..1e7a618 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,109 +1,49 @@ -# Based on the "trust" template v0.1.2 -# https://github.com/japaric/trust/tree/v0.1.2 - -dist: trusty language: rust -services: docker -sudo: required -addons: - chrome: stable -env: - global: - - CRATE_NAME=dtparse - -matrix: +jobs: include: - # Android - - env: TARGET=aarch64-linux-android DISABLE_TESTS=1 - - env: TARGET=arm-linux-androideabi DISABLE_TESTS=1 - - env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1 - - env: TARGET=i686-linux-android DISABLE_TESTS=1 - - env: TARGET=x86_64-linux-android DISABLE_TESTS=1 + - rust: stable + os: linux + - rust: 1.28.0 + os: linux + - rust: stable + os: osx + - rust: stable-msvc + os: windows + - rust: stable + os: windows - # iOS - - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1 - os: osx - - env: TARGET=armv7-apple-ios DISABLE_TESTS=1 - os: osx - - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1 - os: osx - - env: TARGET=i386-apple-ios DISABLE_TESTS=1 - os: osx - - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1 - os: osx +cache: + - cargo - # Linux - - env: TARGET=aarch64-unknown-linux-gnu - - env: TARGET=arm-unknown-linux-gnueabi - - env: TARGET=armv7-unknown-linux-gnueabihf - - env: TARGET=i686-unknown-linux-gnu - - env: TARGET=i686-unknown-linux-musl - - env: TARGET=mips-unknown-linux-gnu - - env: TARGET=mips64-unknown-linux-gnuabi64 - - env: TARGET=mips64el-unknown-linux-gnuabi64 - - env: TARGET=mipsel-unknown-linux-gnu - - env: TARGET=powerpc-unknown-linux-gnu - - env: TARGET=powerpc64-unknown-linux-gnu - - env: TARGET=powerpc64le-unknown-linux-gnu - - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1 - - env: TARGET=x86_64-unknown-linux-gnu - - env: TARGET=x86_64-unknown-linux-musl - - # OSX - - env: TARGET=i686-apple-darwin - os: osx - - env: TARGET=x86_64-apple-darwin - os: osx - - # *BSD - - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1 - - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 - - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1 - - # Windows - - env: TARGET=x86_64-pc-windows-gnu - - # Nightly and Beta - - env: TARGET=x86_64-unknown-linux-gnu - rust: nightly - - env: TARGET=x86_64-apple-darwin - os: osx - rust: nightly - - env: TARGET=x86_64-unknown-linux-gnu - rust: beta - - env: TARGET=x86_64-apple-darwin - os: osx - rust: beta - - # Historical Rust versions - - env: TARGET=x86_64-unknown-linux-gnu - rust: 1.28.0 - -before_install: - - set -e - - rustup self update - -install: - - sh ci/install.sh - - source ~/.cargo/env || true +before_script: + - rustup show + # CMake doesn't like the `sh.exe` provided by Git being in PATH + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then rm "C:/Program Files/Git/usr/bin/sh.exe"; fi + - rustup component add clippy + - rustup component add rustfmt script: - - bash ci/script.sh + - cargo clippy --all + - cargo fmt --all -- --check -after_script: set +e + # For default build, split up compilation and tests so we can track build times + - cargo test --no-run + - cargo test + - cargo test --release --no-run + - cargo test --release + + # Run tests using static linking + - cd "$TRAVIS_BUILD_DIR/libaeron-sys" + - cargo test --features "static" + + - cd "$TRAVIS_BUILD_DIR/libaeron_driver-sys" + - cargo test --features "static" -cache: cargo -before_cache: - # Travis can't cache files that are not readable by "others" - - chmod -R a+r $HOME/.cargo branches: only: - # release tags - - /^v\d+\.\d+\.\d+.*$/ - master - -notifications: - email: - on_success: never + - staging + - trying + diff --git a/Cargo.toml b/Cargo.toml index 7207e7f..e12981d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,6 @@ license = "Apache-2.0" [badges] travis-ci = { repository = "bspeice/dtparse" } -appveyor = { repository = "bspeice/dtparse" } maintenance = { status = "passively-maintained" } [lib] diff --git a/README.md b/README.md index 771ba1a..8dbe81a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # dtparse [![travisci](https://travis-ci.org/bspeice/dtparse.svg?branch=master)](https://travis-ci.org/bspeice/dtparse) -[![appveyor](https://ci.appveyor.com/api/projects/status/r4de76tg9utfjva1/branch/master?svg=true)](https://ci.appveyor.com/project/bspeice/dtparse/branch/master) [![crates.io](https://img.shields.io/crates/v/dtparse.svg)](https://crates.io/crates/dtparse) [![docs.rs](https://docs.rs/dtparse/badge.svg)](https://docs.rs/dtparse/) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index a0c4f1b..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,121 +0,0 @@ -# Appveyor configuration template for Rust using rustup for Rust installation -# https://github.com/starkat99/appveyor-rust - -## Operating System (VM environment) ## - -# Rust needs at least Visual Studio 2013 Appveyor OS for MSVC targets. -os: Visual Studio 2017 - -## Build Matrix ## - -# This configuration will setup a build for each channel & target combination (12 windows -# combinations in all). -# -# There are 3 channels: stable, beta, and nightly. -# -# Alternatively, the full version may be specified for the channel to build using that specific -# version (e.g. channel: 1.5.0) -# -# The values for target are the set of windows Rust build targets. Each value is of the form -# -# ARCH-pc-windows-TOOLCHAIN -# -# Where ARCH is the target architecture, either x86_64 or i686, and TOOLCHAIN is the linker -# toolchain to use, either msvc or gnu. See https://www.rust-lang.org/downloads.html#win-foot for -# a description of the toolchain differences. -# See https://github.com/rust-lang-nursery/rustup.rs/#toolchain-specification for description of -# toolchains and host triples. -# -# Comment out channel/target combos you do not wish to build in CI. -# -# You may use the `cargoflags` and `RUSTFLAGS` variables to set additional flags for cargo commands -# and rustc, respectively. For instance, you can uncomment the cargoflags lines in the nightly -# channels to enable unstable features when building for nightly. Or you could add additional -# matrix entries to test different combinations of features. -environment: - matrix: - -### MSVC Toolchains ### - - # Stable 64-bit MSVC - - channel: stable - target: x86_64-pc-windows-msvc - # Stable 32-bit MSVC - - channel: stable - target: i686-pc-windows-msvc - # Beta 64-bit MSVC - - channel: beta - target: x86_64-pc-windows-msvc - # Beta 32-bit MSVC - - channel: beta - target: i686-pc-windows-msvc - # Nightly 64-bit MSVC - - channel: nightly - target: x86_64-pc-windows-msvc - #cargoflags: --features "unstable" - # Nightly 32-bit MSVC - - channel: nightly - target: i686-pc-windows-msvc - #cargoflags: --features "unstable" - -### GNU Toolchains ### - - # Stable 64-bit GNU - - channel: stable - target: x86_64-pc-windows-gnu - # Stable 32-bit GNU - - channel: stable - target: i686-pc-windows-gnu - # Beta 64-bit GNU - - channel: beta - target: x86_64-pc-windows-gnu - # Beta 32-bit GNU - - channel: beta - target: i686-pc-windows-gnu - # Nightly 64-bit GNU - - channel: nightly - target: x86_64-pc-windows-gnu - #cargoflags: --features "unstable" - # Nightly 32-bit GNU - - channel: nightly - target: i686-pc-windows-gnu - #cargoflags: --features "unstable" - -### Allowed failures ### - -# See Appveyor documentation for specific details. In short, place any channel or targets you wish -# to allow build failures on (usually nightly at least is a wise choice). This will prevent a build -# or test failure in the matching channels/targets from failing the entire build. -matrix: - allow_failures: - - channel: nightly - -# If you only care about stable channel build failures, uncomment the following line: - #- channel: beta - -## Install Script ## - -# This is the most important part of the Appveyor configuration. This installs the version of Rust -# specified by the 'channel' and 'target' environment variables from the build matrix. This uses -# rustup to install Rust. -# -# For simple configurations, instead of using the build matrix, you can simply set the -# default-toolchain and default-host manually here. -install: - - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - - rustup-init -yv --default-toolchain %channel% --default-host %target% - - set PATH=%PATH%;%USERPROFILE%\.cargo\bin - - rustc -vV - - cargo -vV - -## Build Script ## - -# 'cargo test' takes care of building for us, so disable Appveyor's build stage. This prevents -# the "directory does not contain a project or solution file" error. -build: false - -# Uses 'cargo test' to run tests and build. Alternatively, the project may call compiled programs -#directly or perform other testing commands. Rust will automatically be placed in the PATH -# environment variable. -test_script: -- cargo test --verbose %cargoflags% \ No newline at end of file diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000..c1605d2 --- /dev/null +++ b/bors.toml @@ -0,0 +1,4 @@ +status = [ + "continuous-integration/travis-ci/push", +] +delete_merged_branches = true \ No newline at end of file