diff options
| author | Eric Huss <eric@huss.org> | 2020-01-31 08:46:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 08:46:01 -0800 |
| commit | 6b4e3584b406c7dbcaf3f049ce3038bf4b9df567 (patch) | |
| tree | 65fefb55f02afc01e308bde01e94d8f128dfc77a | |
| parent | 2f59943c04f0aa204a9238d6a699ba9cc06c88d9 (diff) | |
| parent | 2ee083dfbe70e6d271578aafc2ff3f99c1775777 (diff) | |
Merge pull request #1131 from ehuss/fix-rustup-ci
Fix CI: Don't update rustup.
| -rw-r--r-- | .github/workflows/deploy.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rwxr-xr-x | ci/install-rustup.sh | 26 |
3 files changed, 0 insertions, 31 deletions
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c93fae75..a3f6b700 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,9 +15,6 @@ jobs: - name: Install hub run: ci/install-hub.sh ${{ matrix.os }} shell: bash - - name: Install Rustup - run: ci/install-rustup.sh stable - shell: bash - name: Install Rust run: ci/install-rust.sh stable shell: bash diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fb610ad5..5ced8e95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,8 +34,6 @@ jobs: rust: 1.35.0 steps: - uses: actions/checkout@master - - name: Install Rustup - run: bash ci/install-rustup.sh ${{ matrix.rust }} - name: Install Rust run: bash ci/install-rust.sh ${{ matrix.rust }} - name: Build and run tests diff --git a/ci/install-rustup.sh b/ci/install-rustup.sh deleted file mode 100755 index 2d3dded5..00000000 --- a/ci/install-rustup.sh +++ /dev/null @@ -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 |