From 4e8d6cfd84a45123fff58406a30e7147da0651d2 Mon Sep 17 00:00:00 2001 From: simon-wh Date: Fri, 14 May 2021 12:11:47 +0100 Subject: [PATCH] Tweak CI behavior slightly to not update rust so much --- .travis.yml | 6 +++--- ci/before_deploy.sh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05f760e..50fc3c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,9 +60,9 @@ matrix: before_install: - set -e - - rustup self update - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then rustup default stable-msvc ; fi - - rustup toolchain install nightly + # - rustup self update + # - if [ "$TRAVIS_OS_NAME" = "windows" ]; then rustup default stable-msvc ; fi + # - rustup toolchain install nightly install: - sh ci/install.sh diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 0cc6b84..35fa512 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -38,7 +38,8 @@ main() { test -f Cargo.lock || cargo generate-lockfile # Currently the --out-dir flag is 'unstable' so unfortunately need to switch to nightly for the build to work properly - rustup default nightly + # Don't need to use this currently as the rust-toolchain file specifies the rust version to use + # rustup default nightly cargo make build-target-release