From fabc3bf44ac4e9431a4e1baab5e91219f7ba204f Mon Sep 17 00:00:00 2001 From: James Duley Date: Sun, 25 Jun 2017 20:39:37 +0100 Subject: [PATCH 1/2] Add CI --- .travis.yml | 73 ++++++++++++++++++++++++++++++++++++++++++++ appveyor.yml | 58 +++++++++++++++++++++++++++++++++++ ci/before_deploy.ps1 | 23 ++++++++++++++ ci/before_deploy.sh | 33 ++++++++++++++++++++ ci/install.sh | 27 ++++++++++++++++ ci/script.sh | 24 +++++++++++++++ 6 files changed, 238 insertions(+) create mode 100644 .travis.yml create mode 100644 appveyor.yml create mode 100644 ci/before_deploy.ps1 create mode 100644 ci/before_deploy.sh create mode 100644 ci/install.sh create mode 100644 ci/script.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..a466bb9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,73 @@ +# Based on the "trust" template v0.1.1 +# https://github.com/japaric/trust/tree/v0.1.1 + +dist: trusty +language: rust +services: docker +sudo: required + +env: + global: + - CRATE_NAME=runtime-target-feature + +matrix: + include: + # Linux + - env: TARGET=i686-unknown-linux-gnu + rust: nightly + #- env: TARGET=i686-unknown-linux-musl + - env: TARGET=x86_64-unknown-linux-gnu + rust: nightly + #- env: TARGET=x86_64-unknown-linux-musl + + # OSX + - env: TARGET=i686-apple-darwin + os: osx + rust: nightly + - env: TARGET=x86_64-apple-darwin + os: osx + rust: nightly + + # *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 + + # Other architectures + #- env: TARGET=aarch64-unknown-linux-gnu + - env: TARGET=armv7-unknown-linux-gnueabihf + rust: nightly + #- 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 + +before_install: set -e + +install: + - sh ci/install.sh + - source ~/.cargo/env || true + +script: + - bash ci/script.sh + +after_script: set +e + +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 diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..3693840 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,58 @@ +# Based on the "trust" template v0.1.1 +# https://github.com/japaric/trust/tree/v0.1.1 + +environment: + global: + RUST_VERSION: nightly + + CRATE_NAME: runtime-target-feature + + matrix: + # MinGW + - TARGET: i686-pc-windows-gnu + - TARGET: x86_64-pc-windows-gnu + + # MSVC + - TARGET: i686-pc-windows-msvc + - TARGET: x86_64-pc-windows-msvc + +install: + - ps: >- + If ($Env:TARGET -eq 'x86_64-pc-windows-gnu') { + $Env:PATH += ';C:\msys64\mingw64\bin' + } ElseIf ($Env:TARGET -eq 'i686-pc-windows-gnu') { + $Env:PATH += ';C:\msys64\mingw32\bin' + } + - curl -sSf -o rustup-init.exe https://win.rustup.rs/ + - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_VERSION% + - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin + - rustc -Vv + - cargo -V + +test_script: + # we don't run the "test phase" when doing deploys + - if [%APPVEYOR_REPO_TAG%]==[false] ( + cargo build --all --target %TARGET% && + cargo build --all --target %TARGET% --release && + cargo test --all --target %TARGET% && + cargo test --all --target %TARGET% --release && + cargo run --all --target %TARGET% && + cargo run --all --target %TARGET% --release + ) + +cache: + - C:\Users\appveyor\.cargo\registry + - target + +branches: + only: + # Release tags + - /^v\d+\.\d+\.\d+.*$/ + - master + +notifications: + - provider: Email + on_build_success: false + +# Building is done in the test phase, so we disable Appveyor's build phase. +build: false diff --git a/ci/before_deploy.ps1 b/ci/before_deploy.ps1 new file mode 100644 index 0000000..191a30b --- /dev/null +++ b/ci/before_deploy.ps1 @@ -0,0 +1,23 @@ +# This script takes care of packaging the build artifacts that will go in the +# release zipfile + +$SRC_DIR = $PWD.Path +$STAGE = [System.Guid]::NewGuid().ToString() + +Set-Location $ENV:Temp +New-Item -Type Directory -Name $STAGE +Set-Location $STAGE + +$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip" + +# TODO Update this to package the right artifacts +Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\hello.exe" '.\' + +7z a "$ZIP" * + +Push-AppveyorArtifact "$ZIP" + +Remove-Item *.* -Force +Set-Location .. +Remove-Item $STAGE +Set-Location $SRC_DIR diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh new file mode 100644 index 0000000..026dc28 --- /dev/null +++ b/ci/before_deploy.sh @@ -0,0 +1,33 @@ +# This script takes care of building your crate and packaging it for release + +set -ex + +main() { + local src=$(pwd) \ + stage= + + case $TRAVIS_OS_NAME in + linux) + stage=$(mktemp -d) + ;; + osx) + stage=$(mktemp -d -t tmp) + ;; + esac + + test -f Cargo.lock || cargo generate-lockfile + + # TODO Update this to build the artifacts that matter to you + cross rustc --bin hello --target $TARGET --release -- -C lto + + # TODO Update this to package the right artifacts + cp target/$TARGET/release/hello $stage/ + + cd $stage + tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz * + cd $src + + rm -rf $stage +} + +main diff --git a/ci/install.sh b/ci/install.sh new file mode 100644 index 0000000..748ad9a --- /dev/null +++ b/ci/install.sh @@ -0,0 +1,27 @@ +set -ex + +main() { + local target= + if [ $TRAVIS_OS_NAME = linux ]; then + target=x86_64-unknown-linux-musl + sort=sort + else + target=x86_64-apple-darwin + sort=gsort # for `sort --sort-version`, from brew's coreutils. + fi + + # This fetches latest stable release + local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ + | cut -d/ -f3 \ + | grep -E '^v[0.1.0-9.]+$' \ + | $sort --version-sort \ + | tail -n1) + curl -LSfs https://japaric.github.io/trust/install.sh | \ + sh -s -- \ + --force \ + --git japaric/cross \ + --tag $tag \ + --target $target +} + +main diff --git a/ci/script.sh b/ci/script.sh new file mode 100644 index 0000000..ddd7f93 --- /dev/null +++ b/ci/script.sh @@ -0,0 +1,24 @@ +# This script takes care of testing your crate + +set -ex + +# TODO This is the "test phase", tweak it as you see fit +main() { + cross build --target $TARGET + cross build --target $TARGET --release + + if [ ! -z $DISABLE_TESTS ]; then + return + fi + + cross test --target $TARGET + cross test --target $TARGET --release + + cross run --target $TARGET + cross run --target $TARGET --release +} + +# we don't run the "test phase" when doing deploys +if [ -z $TRAVIS_TAG ]; then + main +fi From 8f2223376488c1ea7b618f2afa025309d8cc3a88 Mon Sep 17 00:00:00 2001 From: James Duley Date: Mon, 4 Sep 2017 22:30:26 +0100 Subject: [PATCH 2/2] fix ci script --- ci/script.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ci/script.sh b/ci/script.sh index ddd7f93..b5e29fe 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -4,18 +4,15 @@ set -ex # TODO This is the "test phase", tweak it as you see fit main() { - cross build --target $TARGET - cross build --target $TARGET --release + cross build --all --target $TARGET + cross build --all --target $TARGET --release if [ ! -z $DISABLE_TESTS ]; then return fi - cross test --target $TARGET - cross test --target $TARGET --release - - cross run --target $TARGET - cross run --target $TARGET --release + cross test --all --target $TARGET + cross test --all --target $TARGET --release } # we don't run the "test phase" when doing deploys