Skip to content

Commit

Permalink
pin down to older nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
untitaker committed Jun 22, 2018
1 parent aeb5640 commit d118b75
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ export RUST_LOG := vdirsyncer_rustext=debug
PYTEST_ARGS =

# Variables below this line are not very interesting for getting started.

TEST_EXTRA_PACKAGES =

# The rust toolchain to install. You need nightly to run clippy
RUST_TOOLCHAIN = nightly-2018-06-18

ifeq ($(COVERAGE), true)
TEST_EXTRA_PACKAGES += pytest-cov
PYTEST_ARGS += --cov-config .coveragerc --cov vdirsyncer
Expand Down Expand Up @@ -149,8 +151,8 @@ ssh-submodule-urls:
git remote get-url origin"

install-rust:
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
rustup update nightly
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $(RUST_TOOLCHAIN)
rustup update $(RUST_TOOLCHAIN)

rust/vdirsyncer_rustext.h:
cd rust/ && cargo build # hack to work around cbindgen bugs
Expand Down

0 comments on commit d118b75

Please sign in to comment.