Skip to content

Commit 48c8741

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

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
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/docker/mips-unknown-linux-musl/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ RUN mkdir /toolchain
1010
# See build_dir/target-mips_24kc_musl/linux-ar71xx_generic/linux-4.14.151
1111
# Musl version: 1.1.24
1212
# See staging_dir/toolchain-mips_24kc_gcc-7.4.0_musl/info.mk
13-
RUN curl --retry 5 -L https://downloads.openwrt.org/releases/19.07.0-rc1/targets/ar71xx/generic/openwrt-sdk-19.07.0-rc1-ar71xx-generic_gcc-7.4.0_musl.Linux-x86_64.tar.xz | \
13+
# FIXME: Use mirror until the original gets back.
14+
RUN curl --retry 5 -L https://rap.mirror.cyberbits.eu/openwrt/releases/19.07.0-rc1/targets/ar71xx/generic/openwrt-sdk-19.07.0-rc1-ar71xx-generic_gcc-7.4.0_musl.Linux-x86_64.tar.xz | \
1415
tar xJf - -C /toolchain --strip-components=1
1516

1617
# See https://lkml.org/lkml/2014/3/14/269

ci/docker/mipsel-unknown-linux-musl/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ RUN mkdir /toolchain
1010
# See build_dir/target-mipsel_mips32_musl/linux-brcm47xx_generic/linux-4.14.151
1111
# Musl version: 1.1.24
1212
# See staging_dir/toolchain-mipsel_mips32_gcc-7.4.0_musl/info.mk
13-
RUN curl --retry 5 -L https://downloads.openwrt.org/releases/19.07.0-rc1/targets/brcm47xx/generic/openwrt-sdk-19.07.0-rc1-brcm47xx-generic_gcc-7.4.0_musl.Linux-x86_64.tar.xz | \
13+
# FIXME: Use mirror until the original gets back.
14+
RUN curl --retry 5 -L https://rap.mirror.cyberbits.eu/openwrt/releases/19.07.0-rc1/targets/ar71xx/generic/openwrt-sdk-19.07.0-rc1-ar71xx-generic_gcc-7.4.0_musl.Linux-x86_64.tar.xz | \
1415
tar xJf - -C /toolchain --strip-components=1
1516

1617
# See https://lkml.org/lkml/2014/3/14/269

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 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)