From 2b1e6a1877defd418b3ce98a8b600b7984a2c7d6 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 24 Nov 2020 13:47:15 +0900 Subject: [PATCH 1/3] Use the newer nightly to fix the build --- .github/workflows/bors.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index 8ce067a8c0fe3..36adeeecf2d41 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -235,7 +235,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup Rust toolchain # FIXME: Pin nightly version to make semverver compilable. - run: TOOLCHAIN=nightly-2020-06-18 sh ./ci/install-rust.sh + run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh - name: Check breaking changes run: sh ci/semver.sh linux @@ -252,7 +252,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup Rust toolchain # FIXME: Pin nightly version to make semverver compilable. - run: TOOLCHAIN=nightly-2020-06-18 sh ./ci/install-rust.sh + run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh - name: Check breaking changes run: sh ci/semver.sh macos From e3ffe257d8224c3284082fa8161738ab97b51aed Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 24 Nov 2020 15:47:52 +0900 Subject: [PATCH 2/3] Use the original semverver --- ci/semver.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/semver.sh b/ci/semver.sh index 75f83aedbb11c..9660792b14cce 100644 --- a/ci/semver.sh +++ b/ci/semver.sh @@ -15,8 +15,7 @@ fi rustup component add rustc-dev llvm-tools-preview -# FIXME: Use upstream once it gets rustup. -cargo install semververfork +cargo install --git https://github.com/rust-dev-tools/rust-semverver TARGETS= case "${OS}" in @@ -71,6 +70,5 @@ for TARGET in $TARGETS; do sleep 1 done - # FIXME: Use upstream once it gets rustup. - cargo semverfork --api-guidelines --target="${TARGET}" + cargo semver --api-guidelines --target="${TARGET}" done From a8a2a131867667cfead3c205fec7140c4a1fd8ec Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Wed, 25 Nov 2020 02:14:46 +0900 Subject: [PATCH 3/3] Drop CI support for cloudabi --- ci/build.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index c7c988ec7ee40..ff7c0eca00302 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -205,7 +205,6 @@ done # sparc-unknown-linux-gnu RUST_LINUX_NO_CORE_TARGETS="\ aarch64-pc-windows-msvc \ -aarch64-unknown-cloudabi \ aarch64-unknown-freebsd \ aarch64-unknown-hermit \ aarch64-unknown-netbsd \ @@ -213,14 +212,12 @@ aarch64-unknown-openbsd \ aarch64-wrs-vxworks \ armebv7r-none-eabi \ armebv7r-none-eabihf \ -armv7-unknown-cloudabi-eabihf \ armv7-wrs-vxworks-eabihf \ armv7r-none-eabi \ armv7r-none-eabihf \ hexagon-unknown-linux-musl \ i586-pc-windows-msvc \ i686-pc-windows-msvc \ -i686-unknown-cloudabi \ i686-unknown-haiku \ i686-unknown-netbsd \ i686-unknown-openbsd \ @@ -253,7 +250,6 @@ thumbv7neon-linux-androideabi \ thumbv7neon-unknown-linux-gnueabihf \ thumbv8m.main-none-eabi \ x86_64-pc-windows-msvc \ -x86_64-unknown-cloudabi \ x86_64-unknown-dragonfly \ x86_64-unknown-haiku \ x86_64-unknown-hermit \