Skip to content

Commit cd6001c

Browse files
authored
Merge pull request #1798 from JohnTitor/semverver
Make semver check workable
2 parents b6396ca + 88c7163 commit cd6001c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

ci/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
239239
mkdir -p target
240240
(
241241
cd target
242-
wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb
242+
wget https://github.com/devkitPro/pacman/releases/download/v1.0.1/devkitpro-pacman.deb
243243
sudo dpkg -i devkitpro-pacman.deb
244244
sudo dkp-pacman -Sy
245245
sudo dkp-pacman -Syu

ci/semver.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ if ! rustc --version | grep -E "nightly" ; then
1313
exit 1
1414
fi
1515

16+
# FIXME: Pin nightly version to make semverver compile.
17+
NIGHTLY_DATE=nightly-2020-06-18
18+
19+
rustup override set ${NIGHTLY_DATE}
20+
1621
rustup component add rustc-dev llvm-tools-preview
1722

1823
# FIXME: Use upstream once it gets rustup.
19-
cargo +nightly install semververfork
24+
cargo +${NIGHTLY_DATE} install semververfork
2025

2126
TARGETS=
2227
case "${OS}" in
@@ -73,5 +78,5 @@ for TARGET in $TARGETS; do
7378
done
7479

7580
# FIXME: Use upstream once it gets rustup.
76-
cargo +nightly semverfork --api-guidelines --target="${TARGET}"
81+
cargo +${NIGHTLY_DATE} semverfork --api-guidelines --target="${TARGET}"
7782
done

0 commit comments

Comments
 (0)