Skip to content

Commit 69a14f7

Browse files
committed
Auto merge of #1981 - JohnTitor:semver-nightly, r=JohnTitor
Use the newer nightly to fix the build
2 parents c9fb51b + a8a2a13 commit 69a14f7

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

.github/workflows/bors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ jobs:
235235
- uses: actions/checkout@v2
236236
- name: Setup Rust toolchain
237237
# FIXME: Pin nightly version to make semverver compilable.
238-
run: TOOLCHAIN=nightly-2020-06-18 sh ./ci/install-rust.sh
238+
run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
239239
- name: Check breaking changes
240240
run: sh ci/semver.sh linux
241241

@@ -252,7 +252,7 @@ jobs:
252252
- uses: actions/checkout@v2
253253
- name: Setup Rust toolchain
254254
# FIXME: Pin nightly version to make semverver compilable.
255-
run: TOOLCHAIN=nightly-2020-06-18 sh ./ci/install-rust.sh
255+
run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
256256
- name: Check breaking changes
257257
run: sh ci/semver.sh macos
258258

ci/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,22 +205,19 @@ done
205205
# sparc-unknown-linux-gnu
206206
RUST_LINUX_NO_CORE_TARGETS="\
207207
aarch64-pc-windows-msvc \
208-
aarch64-unknown-cloudabi \
209208
aarch64-unknown-freebsd \
210209
aarch64-unknown-hermit \
211210
aarch64-unknown-netbsd \
212211
aarch64-unknown-openbsd \
213212
aarch64-wrs-vxworks \
214213
armebv7r-none-eabi \
215214
armebv7r-none-eabihf \
216-
armv7-unknown-cloudabi-eabihf \
217215
armv7-wrs-vxworks-eabihf \
218216
armv7r-none-eabi \
219217
armv7r-none-eabihf \
220218
hexagon-unknown-linux-musl \
221219
i586-pc-windows-msvc \
222220
i686-pc-windows-msvc \
223-
i686-unknown-cloudabi \
224221
i686-unknown-haiku \
225222
i686-unknown-netbsd \
226223
i686-unknown-openbsd \
@@ -253,7 +250,6 @@ thumbv7neon-linux-androideabi \
253250
thumbv7neon-unknown-linux-gnueabihf \
254251
thumbv8m.main-none-eabi \
255252
x86_64-pc-windows-msvc \
256-
x86_64-unknown-cloudabi \
257253
x86_64-unknown-dragonfly \
258254
x86_64-unknown-haiku \
259255
x86_64-unknown-hermit \

ci/semver.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ fi
1515

1616
rustup component add rustc-dev llvm-tools-preview
1717

18-
# FIXME: Use upstream once it gets rustup.
19-
cargo install semververfork
18+
cargo install --git https://github.com/rust-dev-tools/rust-semverver
2019

2120
TARGETS=
2221
case "${OS}" in
@@ -71,6 +70,5 @@ for TARGET in $TARGETS; do
7170
sleep 1
7271
done
7372

74-
# FIXME: Use upstream once it gets rustup.
75-
cargo semverfork --api-guidelines --target="${TARGET}"
73+
cargo semver --api-guidelines --target="${TARGET}"
7674
done

0 commit comments

Comments
 (0)