From 2aa8751261870875d2664ac6515026b9c8d87ee4 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Mon, 6 Jul 2020 01:48:47 +0900 Subject: [PATCH] ci: use latest stable compiler on macOS ci (#2643) --- .github/workflows/test_tokio.yml | 15 --------------- ci/azure-test-stable.yml | 5 +---- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/test_tokio.yml b/.github/workflows/test_tokio.yml index 522f7b14b63..d6d32b8f54b 100644 --- a/.github/workflows/test_tokio.yml +++ b/.github/workflows/test_tokio.yml @@ -25,11 +25,6 @@ jobs: - uses: actions/checkout@master - name: Install Rust run: rustup update stable - if: matrix.os != 'macos-latest' - # https://github.com/rust-lang/rust/issues/73030 - - name: Install Rust - run: rustup update 1.43.1 && rustup default 1.43.1 - if: matrix.os == 'macos-latest' # Run `tokio` with only `full` - uses: actions-rs/cargo@v1 @@ -73,11 +68,6 @@ jobs: - uses: actions/checkout@master - name: Install Rust run: rustup update stable - if: matrix.os != 'macos-latest' - # https://github.com/rust-lang/rust/issues/73030 - - name: Install Rust - run: rustup update 1.43.1 && rustup default 1.43.1 - if: matrix.os == 'macos-latest' # Run with all crate features - name: ${{ matrix.crate }} - cargo test --all-features @@ -130,11 +120,6 @@ jobs: - uses: actions/checkout@master - name: Install Rust run: rustup update stable - if: matrix.os != 'macos-latest' - # https://github.com/rust-lang/rust/issues/73030 - - name: Install Rust - run: rustup update 1.43.1 && rustup default 1.43.1 - if: matrix.os == 'macos-latest' - run: cargo install cargo-hack name: Install cargo-hack - uses: actions-rs/cargo@v1 diff --git a/ci/azure-test-stable.yml b/ci/azure-test-stable.yml index 042be745101..55aa84e092d 100644 --- a/ci/azure-test-stable.yml +++ b/ci/azure-test-stable.yml @@ -5,22 +5,19 @@ jobs: matrix: Linux: vmImage: ubuntu-16.04 - rust_version: ${{ parameters.rust }} ${{ if parameters.cross }}: MacOS: vmImage: macos-latest - rust_version: 1.43.1 # https://github.com/rust-lang/rust/issues/73030 Windows: vmImage: vs2017-win2016 - rust_version: ${{ parameters.rust }} pool: vmImage: $(vmImage) steps: - template: azure-install-rust.yml parameters: - rust_version: $(rust_version) + rust_version: ${{ parameters.rust }} - template: azure-is-release.yml