From 4cb73858588d22cee22e8a6b8226c05b40fbf33f Mon Sep 17 00:00:00 2001 From: roblabla Date: Thu, 20 Sep 2018 21:48:31 +0000 Subject: [PATCH 1/4] Use trust to publish prebuilt binary on all platforms --- .travis.yml | 121 +++++++++++++++++++++++++++++++++++++++++-- appveyor.yml | 78 ++++++++++++++++++++++++++++ ci/before_deploy.ps1 | 22 ++++++++ ci/before_deploy.sh | 31 +++++++++++ ci/install.sh | 47 +++++++++++++++++ ci/script.sh | 18 +++++++ 6 files changed, 312 insertions(+), 5 deletions(-) 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 index 1c7f31e..6e22b4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,120 @@ +# Based on the "trust" template v0.1.2 +# https://github.com/japaric/trust/tree/v0.1.2 + +dist: trusty language: rust -rust: -- stable +services: docker +sudo: required + +env: + global: + - CRATE_NAME=linkle + +matrix: + 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 + + # 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 + + # 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 + + # Bare metal + # These targets don't support std and as such are likely not suitable for + # most crates. + # - env: TARGET=thumbv6m-none-eabi + # - env: TARGET=thumbv7em-none-eabi + # - env: TARGET=thumbv7em-none-eabihf + # - env: TARGET=thumbv7m-none-eabi + + # Testing other channels + - env: TARGET=x86_64-unknown-linux-gnu + rust: nightly + #- env: TARGET=x86_64-apple-darwin + # os: osx + # rust: nightly + +before_install: + - set -e + - rustup self update + +install: + - sh ci/install.sh + - source ~/.cargo/env || true script: -- cargo build --verbose --all --all-features -- cargo test --verbose --all --all-features + - bash ci/script.sh + +after_script: set +e + +before_deploy: + - sh ci/before_deploy.sh + +deploy: + api_key: + secure: "ReKXiuhMkVUkvlD74NNGYWywRKypSVzeVEYzdnWvI/Un626vtaWhaL9LH2h/3SYnlnNrK7gVQELsmJpgUlptzhW+hNdjswnSIB+1UxNNodMKicAhYBon4UaqnB/N7T+u1azCDdLpT5X9hNqbAfyCd05PZrEBslJVud9W/ePaqqTrTJCv0TrBn0S0G53N7wAESfUhg40EuLlmABM4RSXygkJjwE3OhsdWZw+huYU9tVeqzWeZKVZasDkkwL4AZgM7R4H8QGB21FCvG673JYBoROhLx38wwPW4or4/lyQbzSP4hPxR33k437+lrkgBXlU4BK1lr6Cg4mrgOQIbCB28f8NdetxdWLEbxTdZ2ri4r/0N7xFAnp83ftLDnzJNADiD27pDAeYYnGCg6fx4ZgD9+IZJYw86jwPfW8sujtqbfGSY8Fq+sP+DI+QLLt5esP+Pag1CTRHqxyrqdCBpH386J9xrjFYagmdLnB1InU+Q5hrJMa/4RjwCiv/WoD3igTuvE55uEu7R72REkKpfyrRHH0ioPoKS7/cF8SD8qjHbXqhOQpOitXmOsjZBPfgbQrUBo/uUnc6rzLtVU1+IMS85D3boWOMTxc5glemc6lfeW5+3K3+yZ1buDXMl+FaIdGHtDHQxzYvHhhIaYke2epnQZPIzoCpKq5Iw/Fi4i8vp4C4=" + file_glob: true + file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.* + on: + condition: $TRAVIS_RUST_VERSION = stable + tags: true + provider: releases + skip_cleanup: true + +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 -cache: cargo \ No newline at end of file +notifications: + email: + on_success: never diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..101e9e8 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,78 @@ +# Based on the "trust" template v0.1.2 +# https://github.com/japaric/trust/tree/v0.1.2 + +environment: + global: + RUST_VERSION: stable + + CRATE_NAME: linkle + + 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 + + # Testing other channels + - TARGET: x86_64-pc-windows-gnu + RUST_VERSION: nightly + - TARGET: x86_64-pc-windows-msvc + RUST_VERSION: nightly + +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 --target %TARGET% && + cargo build --target %TARGET% --release && + cargo test --target %TARGET% && + cargo test --target %TARGET% --release && + cargo run --target %TARGET% && + cargo run --target %TARGET% --release + ) + +before_deploy: + - cargo rustc --target %TARGET% --release --bin linkle -- -C lto + - ps: ci\before_deploy.ps1 + +deploy: + artifact: /.*\.zip/ + auth_token: + secure: FOmGQF6auFsUYXW6aoYP/jXsooHa3hkOPKr2jei/s9Pg1OSJsWbthpTKvu3IZgfX + description: '' + on: + RUST_VERSION: stable + appveyor_repo_tag: true + provider: GitHub + +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..a6fd76f --- /dev/null +++ b/ci/before_deploy.ps1 @@ -0,0 +1,22 @@ +# 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" + +Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\linkle.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..c14a367 --- /dev/null +++ b/ci/before_deploy.sh @@ -0,0 +1,31 @@ +# 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 + + cross rustc --bin linkle --target $TARGET --release -- -C lto + + cp target/$TARGET/release/linkle $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..80e18e4 --- /dev/null +++ b/ci/install.sh @@ -0,0 +1,47 @@ +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 + + # Builds for iOS are done on OSX, but require the specific target to be + # installed. + case $TARGET in + aarch64-apple-ios) + rustup target install aarch64-apple-ios + ;; + armv7-apple-ios) + rustup target install armv7-apple-ios + ;; + armv7s-apple-ios) + rustup target install armv7s-apple-ios + ;; + i386-apple-ios) + rustup target install i386-apple-ios + ;; + x86_64-apple-ios) + rustup target install x86_64-apple-ios + ;; + esac + + # 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..a530036 --- /dev/null +++ b/ci/script.sh @@ -0,0 +1,18 @@ +# This script takes care of testing your crate + +set -ex + +main() { + cross build --target $TARGET --release --all-features + + if [ ! -z $DISABLE_TESTS ]; then + return + fi + + cross test --target $TARGET --release --all-features +} + +# we don't run the "test phase" when doing deploys +if [ -z $TRAVIS_TAG ]; then + main +fi From e670af5c0da6bc5c7ac58d2fafb195aae7485ee4 Mon Sep 17 00:00:00 2001 From: roblabla Date: Thu, 20 Sep 2018 22:06:33 +0000 Subject: [PATCH 2/4] Disable i686 linux builds, as they fail. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6e22b4c..cb111d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,9 @@ matrix: #- env: TARGET=arm-unknown-linux-gnueabi #- env: TARGET=armv7-unknown-linux-gnueabihf # - env: TARGET=i686-unknown-linux-gnu - - env: TARGET=i686-unknown-linux-musl + # TODO: It'd be nice to have 32-bit linux builds, but for some reasons + # backtrace-sys fails to compile properly. + # - env: TARGET=i686-unknown-linux-musl # - env: TARGET=mips-unknown-linux-gnu # - env: TARGET=mips64-unknown-linux-gnuabi64 # - env: TARGET=mips64el-unknown-linux-gnuabi64 From a9b1852aa0236e309bf6d41bc64b2456133044b8 Mon Sep 17 00:00:00 2001 From: roblabla Date: Thu, 20 Sep 2018 22:19:15 +0000 Subject: [PATCH 3/4] Only build MSVC targets on appveryor. Use all-features --- appveyor.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 101e9e8..052f04e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,18 +9,18 @@ environment: matrix: # MinGW - - TARGET: i686-pc-windows-gnu - - TARGET: x86_64-pc-windows-gnu + #- TARGET: i686-pc-windows-gnu + #- TARGET: x86_64-pc-windows-gnu # MSVC - TARGET: i686-pc-windows-msvc - TARGET: x86_64-pc-windows-msvc # Testing other channels - - TARGET: x86_64-pc-windows-gnu - RUST_VERSION: nightly - - TARGET: x86_64-pc-windows-msvc - RUST_VERSION: nightly + #- TARGET: x86_64-pc-windows-gnu + # RUST_VERSION: nightly + #- TARGET: x86_64-pc-windows-msvc + # RUST_VERSION: nightly install: - ps: >- @@ -38,16 +38,12 @@ install: test_script: # we don't run the "test phase" when doing deploys - if [%APPVEYOR_REPO_TAG%]==[false] ( - cargo build --target %TARGET% && - cargo build --target %TARGET% --release && - cargo test --target %TARGET% && - cargo test --target %TARGET% --release && - cargo run --target %TARGET% && - cargo run --target %TARGET% --release + cargo build --target %TARGET% --release --all-features && + cargo test --target %TARGET% --release --all-features ) before_deploy: - - cargo rustc --target %TARGET% --release --bin linkle -- -C lto + - cargo rustc --target %TARGET% --release --all-features --bin linkle -- -C lto - ps: ci\before_deploy.ps1 deploy: From 93ffc72d14f483f077c96c4027d03e99fff7b9db Mon Sep 17 00:00:00 2001 From: roblabla Date: Thu, 20 Sep 2018 22:19:32 +0000 Subject: [PATCH 4/4] Use all-features when deploying in travis builds --- ci/before_deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index c14a367..10c8ca0 100644 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -17,7 +17,7 @@ main() { test -f Cargo.lock || cargo generate-lockfile - cross rustc --bin linkle --target $TARGET --release -- -C lto + cross rustc --bin linkle --target $TARGET --release --all-features -- -C lto cp target/$TARGET/release/linkle $stage/