Skip to content

Commit

Permalink
Auto merge of #2226 - JohnTitor:semverver, r=JohnTitor
Browse files Browse the repository at this point in the history
Update `rust-semverver` to the current master

r? `@ghost`
  • Loading branch information
bors committed Jun 10, 2021
2 parents 3df6aaa + df33c95 commit 3048ef8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bors.yml
Expand Up @@ -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

Expand All @@ -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

Expand Down
6 changes: 2 additions & 4 deletions ci/semver.sh
Expand Up @@ -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*)
Expand All @@ -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 \
Expand Down

0 comments on commit 3048ef8

Please sign in to comment.