Merge #440

440: Bump version to 0.2.1. r=adamgreig a=reitermarkus Prepare 0.2.1 release. Updated some dependencies and disabled the `powerpc64-unknown-linux-gnu` and `sparc64-unknown-linux-gnu` images since they keep breaking. Co-authored-by: Markus Reiter <me@reitermark.us>
cross-rs · Jun 30, 2020 · 8d7c07d · 8d7c07d
2 parents 095870a + a1ca96d
commit 8d7c07d
Show file tree

Hide file tree

Showing 19 changed files with 146 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.2.1] - 2020-06-30
+
+- Disabled `powerpc64-unknown-linux-gnu` image.
+- Disabled `sparc64-unknown-linux-gnu` image.
 - Disabled `x86_64-unknown-dragonfly` image.
 - Removed CI testing for `i686-apple-darwin`.
 
@@ -224,7 +228,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Initial release. Supports 12 targets.
 
-[Unreleased]: https://github.com/rust-embedded/cross/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/rust-embedded/cross/compare/v0.2.1...HEAD
+[v0.2.1]: https://github.com/rust-embedded/cross/compare/v0.2.0...v0.2.1
 [v0.2.0]: https://github.com/rust-embedded/cross/compare/v0.1.16...v0.2.0
 [v0.1.16]: https://github.com/rust-embedded/cross/compare/v0.1.15...v0.1.16
 [v0.1.15]: https://github.com/rust-embedded/cross/compare/v0.1.14...v0.1.15

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ keywords = ["cross", "compilation", "testing", "tool"]
 license = "MIT OR Apache-2.0"
 name = "cross"
 repository = "https://github.com/rust-embedded/cross"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2018"
 
 [dependencies]

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -30,11 +30,11 @@ jobs:
         mips64-unknown-linux-gnuabi64:   { TARGET: mips64-unknown-linux-gnuabi64,   CPP: 1, DYLIB: 1, STD: 1, RUN: 1 }
         mips64el-unknown-linux-gnuabi64: { TARGET: mips64el-unknown-linux-gnuabi64, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
         powerpc-unknown-linux-gnu:       { TARGET: powerpc-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
-        powerpc64-unknown-linux-gnu:     { TARGET: powerpc64-unknown-linux-gnu,     CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
+      # powerpc64-unknown-linux-gnu:     { TARGET: powerpc64-unknown-linux-gnu,     CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
         powerpc64le-unknown-linux-gnu:   { TARGET: powerpc64le-unknown-linux-gnu,   CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
         riscv64gc-unknown-linux-gnu:     { TARGET: riscv64gc-unknown-linux-gnu,     CPP: 1,           STD: 1, RUN: 1 }
         s390x-unknown-linux-gnu:         { TARGET: s390x-unknown-linux-gnu,         CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system }
-        sparc64-unknown-linux-gnu:       { TARGET: sparc64-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system }
+      # sparc64-unknown-linux-gnu:       { TARGET: sparc64-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system }
         x86_64-unknown-linux-gnu:        { TARGET: x86_64-unknown-linux-gnu,        CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: native qemu-user qemu-system, DEPLOY: 1, CRATES_IO_PUBLISH: 1 }
         aarch64-unknown-linux-musl:      { TARGET: aarch64-unknown-linux-musl,                        STD: 1, RUN: 1 }
         arm-unknown-linux-musleabihf:    { TARGET: arm-unknown-linux-musleabihf,                      STD: 1, RUN: 1 }
@@ -81,7 +81,7 @@ jobs:
       - bash: echo "##vso[task.setvariable variable=TAG]${BUILD_SOURCEBRANCH##refs/tags/}"
         displayName: Set TAG Variable
         condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
-      - bash: cargo test 
+      - bash: cargo test
         displayName: Run unit tests
         timeoutInMinutes: 5
       - bash: ./build-docker-image.sh "${TARGET}"

diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml
@@ -13,7 +13,9 @@ steps:
           rustup self update
         fi
       else
-        curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain="$TOOLCHAIN" --profile=minimal
+        curl --retry 3 -sSfL https://sh.rustup.rs -o rustup-init.sh
+        sh rustup-init.sh -y --default-toolchain="$TOOLCHAIN" --profile=minimal
+        rm rustup-init.sh
         echo "##vso[task.prependpath]$HOME/.cargo/bin"
       fi
     displayName: Install rustup