diff options
| -rw-r--r-- | .github/workflows/ci.yaml | 28 | ||||
| -rw-r--r-- | .github/workflows/metrics.yaml | 9 | ||||
| -rw-r--r-- | .github/workflows/publish.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/release.yaml | 28 | ||||
| -rw-r--r-- | .github/workflows/rustdoc.yaml | 7 |
5 files changed, 16 insertions, 66 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8ba4f07d4a7..35407060952 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,21 +37,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 20 - # We need to disable the existing toolchain to avoid updating rust-docs - # which takes a long time. The fastest way to do this is to rename the - # existing folder, as deleting it takes about as much time as not doing - # anything and just updating rust-docs. - - name: Rename existing rust toolchain (Windows) - if: matrix.os == 'windows-latest' - run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - override: true - components: rustfmt, rust-src + run: | + rustup update stable + rustup component add rustfmt rust-src - name: Cache Dependencies uses: Swatinem/rust-cache@ce325b60658c1b38465c06cc965b79baf32c1e72 @@ -79,14 +68,9 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - override: true - - - name: Install Rust targets - run: rustup target add ${{ env.targets }} ${{ env.targets_ide }} + run: | + rustup update stable + rustup target add ${{ env.targets }} ${{ env.targets_ide }} - name: Cache Dependencies uses: Swatinem/rust-cache@ce325b60658c1b38465c06cc965b79baf32c1e72 diff --git a/.github/workflows/metrics.yaml b/.github/workflows/metrics.yaml index af6c6107847..1407bd8f68e 100644 --- a/.github/workflows/metrics.yaml +++ b/.github/workflows/metrics.yaml @@ -20,12 +20,9 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - override: true - components: rust-src + run: | + rustup update stable + rustup component add rustfmt rust-src - name: Collect metrics run: cargo xtask metrics diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e4892dccf45..7020726165b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,16 +20,10 @@ jobs: fetch-depth: 0 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - override: true + run: rustup update stable - name: Install cargo-workspaces - uses: actions-rs/install@v0.1 - with: - crate: cargo-workspaces + run: cargo install cargo-workspaces - name: Release env: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9205d86f93d..cb47d3973ec 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -55,31 +55,11 @@ jobs: with: fetch-depth: ${{ env.FETCH_DEPTH }} - # We need to disable the existing toolchain to avoid updating rust-docs - # which takes a long time. The fastest way to do this is to rename the - # existing folder, as deleting it takes about as much time as not doing - # anything and just updating rust-docs. - - name: Rename existing Rust toolchain - if: matrix.os == 'windows-latest' - run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.target }} - profile: minimal - override: true - - - name: Install Rust library source - if: matrix.target == 'x86_64-unknown-linux-gnu' - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.target }} - profile: minimal - override: true - components: rust-src + run: | + rustup update stable + rustup target add ${{ matrix.target }} + rustup component add rust-src - name: Install Node.js uses: actions/setup-node@v1 diff --git a/.github/workflows/rustdoc.yaml b/.github/workflows/rustdoc.yaml index 227fab54ebb..5ed4e8ca64f 100644 --- a/.github/workflows/rustdoc.yaml +++ b/.github/workflows/rustdoc.yaml @@ -20,12 +20,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - override: true - components: rustfmt, rust-src + run: rustup update stable - name: Build Documentation run: cargo doc --all --no-deps |