Fix CI: Don't update rustup.
This commit is contained in:
parent
2f59943c04
commit
2ee083dfbe
|
@ -15,9 +15,6 @@ jobs:
|
||||||
- name: Install hub
|
- name: Install hub
|
||||||
run: ci/install-hub.sh ${{ matrix.os }}
|
run: ci/install-hub.sh ${{ matrix.os }}
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: Install Rustup
|
|
||||||
run: ci/install-rustup.sh stable
|
|
||||||
shell: bash
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
run: ci/install-rust.sh stable
|
run: ci/install-rust.sh stable
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
|
@ -34,8 +34,6 @@ jobs:
|
||||||
rust: 1.35.0
|
rust: 1.35.0
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@master
|
- uses: actions/checkout@master
|
||||||
- name: Install Rustup
|
|
||||||
run: bash ci/install-rustup.sh ${{ matrix.rust }}
|
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
run: bash ci/install-rust.sh ${{ matrix.rust }}
|
run: bash ci/install-rust.sh ${{ matrix.rust }}
|
||||||
- name: Build and run tests
|
- name: Build and run tests
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Install/update rustup.
|
|
||||||
# The first argument should be the toolchain to install.
|
|
||||||
#
|
|
||||||
# It is helpful to have this as a separate script due to some issues on
|
|
||||||
# Windows where immediately after `rustup self update`, rustup can fail with
|
|
||||||
# "Device or resource busy".
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
if [ -z "$1" ]
|
|
||||||
then
|
|
||||||
echo "First parameter must be toolchain to install."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
TOOLCHAIN="$1"
|
|
||||||
|
|
||||||
# Install/update rustup.
|
|
||||||
if command -v rustup
|
|
||||||
then
|
|
||||||
echo `command -v rustup` `rustup -V` already installed
|
|
||||||
rustup self update
|
|
||||||
else
|
|
||||||
# macOS currently does not have rust pre-installed.
|
|
||||||
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN --profile=minimal
|
|
||||||
echo "##[add-path]$HOME/.cargo/bin"
|
|
||||||
fi
|
|
Loading…
Reference in New Issue