summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuki Okushi <yuki.okushi@huawei.com>2021-06-10 11:08:35 +0900
committerYuki Okushi <yuki.okushi@huawei.com>2021-06-10 11:08:35 +0900
commitdf33c954f3815916c0ecadddd4d4174f06e30430 (patch)
treef7babf2bc48bd09f64cc8d5c86ec04641c1c5fcb
parent3df6aaa801b7e5ba1f20314416706e5a32bcb2b9 (diff)
downloadrust-libc-df33c954f3815916c0ecadddd4d4174f06e30430.tar.gz
Update `rust-semverver` to the current master
-rw-r--r--.github/workflows/bors.yml4
-rw-r--r--ci/semver.sh6
2 files changed, 4 insertions, 6 deletions
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
index 241940a823..32ffd539cb 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 4fe13a974d..0e1f15e666 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 \