Skip to content

Commit 3048ef8

Browse files
committed
Auto merge of #2226 - JohnTitor:semverver, r=JohnTitor
Update `rust-semverver` to the current master r? `@ghost`
2 parents 3df6aaa + df33c95 commit 3048ef8

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/bors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ jobs:
238238
- uses: actions/checkout@v2
239239
- name: Setup Rust toolchain
240240
# Should update the semverver revision in semver.sh if we touch nightly ver.
241-
run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
241+
run: TOOLCHAIN=nightly-2021-05-21 sh ./ci/install-rust.sh
242242
- name: Check breaking changes
243243
run: sh ci/semver.sh linux
244244

@@ -253,7 +253,7 @@ jobs:
253253
- uses: actions/checkout@v2
254254
- name: Setup Rust toolchain
255255
# FIXME: Pin nightly version to make semverver compilable.
256-
run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
256+
run: TOOLCHAIN=nightly-2021-05-21 sh ./ci/install-rust.sh
257257
- name: Check breaking changes
258258
run: sh ci/semver.sh macos
259259

ci/semver.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ fi
1616
rustup component add rustc-dev llvm-tools-preview
1717

1818
# Should update the nightly version in bors CI config if we touch this.
19-
cargo install --locked --git https://github.com/rust-lang/rust-semverver --rev 71c340ff867d2f79613cfe02c6714f1d2ef00bc4
19+
cargo install --locked --git https://github.com/rust-lang/rust-semverver --rev 6d2403c219834d3a6c44cec093db820a0dbe5d21
2020

21-
# FIXME: Replace `x86_64-sun-solaris` with `x86_64-pc-solaris`
22-
# when we update the nightly date for semverver to nightly-2021-03-02 or later.
2321
TARGETS=
2422
case "${OS}" in
2523
*linux*)
@@ -41,7 +39,7 @@ x86_64-unknown-freebsd \
4139
x86_64-unknown-linux-gnu \
4240
x86_64-unknown-linux-musl \
4341
x86_64-unknown-netbsd \
44-
x86_64-sun-solaris \
42+
x86_64-pc-solaris \
4543
x86_64-fuchsia \
4644
x86_64-pc-windows-gnu \
4745
x86_64-unknown-linux-gnux32 \

0 commit comments

Comments
 (0)