diff --git a/.travis.yml b/.travis.yml index 53ffe6d4..ad0491c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,11 +36,12 @@ matrix: - env: TARGET=x86_64-unknown-linux-gnu VENDOR=OTHER rust: nightly - # Linux - - env: TARGET=i686-unknown-linux-gnu - - env: TARGET=i686-unknown-linux-musl - - env: TARGET=x86_64-unknown-linux-gnu - - env: TARGET=x86_64-unknown-linux-musl + # Stable, used to produce binary releases + # Linux; we do the MUSL builds locally and then upload the binaries + # - env: TARGET=i686-unknown-linux-gnu + # - env: TARGET=i686-unknown-linux-musl + # - env: TARGET=x86_64-unknown-linux-gnu + # - env: TARGET=x86_64-unknown-linux-musl # OSX - env: TARGET=i686-apple-darwin diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 681c8cb3..41d6879c 100644 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -1,13 +1,7 @@ set -euxo pipefail main() { - if [ $TARGET = x86_64-pc-windows-msvc ]; then - cargo=cargo - else - cargo=cross - fi - - $cargo rustc --bin svd2rust --target $TARGET --release -- -C lto + cargo rustc --bin svd2rust --target $TARGET --release -- -C lto rm -rf stage mkdir stage diff --git a/ci/install.sh b/ci/install.sh index 33c4098c..f93541fa 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -10,17 +10,18 @@ main() { sort=gsort fi - local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ - | cut -d/ -f3 \ - | grep -E '^v[0-9.]+$' \ - | $sort --version-sort \ - | tail -n1) - curl -LSfs https://japaric.github.io/trust/install.sh | \ - sh -s -- \ - --force \ - --git japaric/cross \ - --tag $tag + # local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ + # | cut -d/ -f3 \ + # | grep -E '^v[0-9.]+$' \ + # | $sort --version-sort \ + # | tail -n1) + # curl -LSfs https://japaric.github.io/trust/install.sh | \ + # sh -s -- \ + # --force \ + # --git japaric/cross \ + # --tag $tag + rustup target add $TARGET rustup component add rustfmt-preview } diff --git a/ci/script.sh b/ci/script.sh index a6d2a36f..118947d9 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -29,13 +29,13 @@ main() { return fi - cross check --target $TARGET + cargo check --target $TARGET if [ -z ${VENDOR-} ]; then return fi - cross build --target $TARGET --release + cargo build --target $TARGET --release case $TRAVIS_OS_NAME in linux)