Skip to content

Use the newer nightly to fix the build #1981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 24, 2020
Merged

Use the newer nightly to fix the build #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b1e6a1
Use the newer nightly to fix the build
JohnTitor Nov 24, 2020
e3ffe25
Use the original semverver
JohnTitor Nov 24, 2020
a8a2a13
Drop CI support for cloudabi
JohnTitor Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/bors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ jobs:
- uses: actions/checkout@v2
- name: Setup Rust toolchain
# FIXME: Pin nightly version to make semverver compilable.
run: TOOLCHAIN=nightly-2020-06-18 sh ./ci/install-rust.sh
run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
- name: Check breaking changes
run: sh ci/semver.sh linux

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

Expand Down
4 changes: 0 additions & 4 deletions ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,22 +205,19 @@ done
# sparc-unknown-linux-gnu
RUST_LINUX_NO_CORE_TARGETS="\
aarch64-pc-windows-msvc \
aarch64-unknown-cloudabi \
aarch64-unknown-freebsd \
aarch64-unknown-hermit \
aarch64-unknown-netbsd \
aarch64-unknown-openbsd \
aarch64-wrs-vxworks \
armebv7r-none-eabi \
armebv7r-none-eabihf \
armv7-unknown-cloudabi-eabihf \
armv7-wrs-vxworks-eabihf \
armv7r-none-eabi \
armv7r-none-eabihf \
hexagon-unknown-linux-musl \
i586-pc-windows-msvc \
i686-pc-windows-msvc \
i686-unknown-cloudabi \
i686-unknown-haiku \
i686-unknown-netbsd \
i686-unknown-openbsd \
Expand Down Expand Up @@ -253,7 +250,6 @@ thumbv7neon-linux-androideabi \
thumbv7neon-unknown-linux-gnueabihf \
thumbv8m.main-none-eabi \
x86_64-pc-windows-msvc \
x86_64-unknown-cloudabi \
x86_64-unknown-dragonfly \
x86_64-unknown-haiku \
x86_64-unknown-hermit \
Expand Down
6 changes: 2 additions & 4 deletions ci/semver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ fi

rustup component add rustc-dev llvm-tools-preview

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

TARGETS=
case "${OS}" in
Expand Down Expand Up @@ -71,6 +70,5 @@ for TARGET in $TARGETS; do
sleep 1
done

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