From df33c954f3815916c0ecadddd4d4174f06e30430 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 10 Jun 2021 11:08:35 +0900 Subject: [PATCH] Update `rust-semverver` to the current master --- .github/workflows/bors.yml | 4 ++-- ci/semver.sh | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index 241940a8236e3..32ffd539cb003 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -238,7 +238,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup Rust toolchain # Should update the semverver revision in semver.sh if we touch nightly ver. - run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh + run: TOOLCHAIN=nightly-2021-05-21 sh ./ci/install-rust.sh - name: Check breaking changes run: sh ci/semver.sh linux @@ -253,7 +253,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup Rust toolchain # FIXME: Pin nightly version to make semverver compilable. - run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh + run: TOOLCHAIN=nightly-2021-05-21 sh ./ci/install-rust.sh - name: Check breaking changes run: sh ci/semver.sh macos diff --git a/ci/semver.sh b/ci/semver.sh index 4fe13a974d39f..0e1f15e666e11 100644 --- a/ci/semver.sh +++ b/ci/semver.sh @@ -16,10 +16,8 @@ fi rustup component add rustc-dev llvm-tools-preview # Should update the nightly version in bors CI config if we touch this. -cargo install --locked --git https://github.com/rust-lang/rust-semverver --rev 71c340ff867d2f79613cfe02c6714f1d2ef00bc4 +cargo install --locked --git https://github.com/rust-lang/rust-semverver --rev 6d2403c219834d3a6c44cec093db820a0dbe5d21 -# FIXME: Replace `x86_64-sun-solaris` with `x86_64-pc-solaris` -# when we update the nightly date for semverver to nightly-2021-03-02 or later. TARGETS= case "${OS}" in *linux*) @@ -41,7 +39,7 @@ x86_64-unknown-freebsd \ x86_64-unknown-linux-gnu \ x86_64-unknown-linux-musl \ x86_64-unknown-netbsd \ -x86_64-sun-solaris \ +x86_64-pc-solaris \ x86_64-fuchsia \ x86_64-pc-windows-gnu \ x86_64-unknown-linux-gnux32 \