diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b36648ab..985f6d560 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,15 +62,6 @@ jobs: if: matrix.build == 'macos' run: brew install p7zip - # We install gnu-tar because BSD tar is buggy on Github's MacOS machines. - # https://github.com/actions/cache/issues/403 - # This can be removed if that issue is ever closed - - name: Install GNU tar (MacOS) - if: matrix.build == 'macos' - run: | - brew install gnu-tar - echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV - - name: Build (Linux) if: matrix.build == 'linux' run: | diff --git a/.github/workflows/test-nightly.yml b/.github/workflows/test-nightly.yml index c66805201..e3526d146 100644 --- a/.github/workflows/test-nightly.yml +++ b/.github/workflows/test-nightly.yml @@ -36,6 +36,7 @@ jobs: key: ${{ matrix.build }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ matrix.build }}-cargo-registry- + - name: Cache Cargo index uses: actions/cache@v2 with: @@ -43,10 +44,12 @@ jobs: key: ${{ matrix.build }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ matrix.build }}-cargo-index- + - name: Install Rust run: | rustup update ${{ matrix.rust }} --no-self-update rustup default ${{ matrix.rust }} + - name: Run Tests run: cargo test --workspace --locked env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d8751655..e4f320ecc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,6 +31,7 @@ jobs: key: ${{ matrix.build }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ matrix.build }}-cargo-registry- + - name: Cache Cargo index uses: actions/cache@v2 with: @@ -38,6 +39,7 @@ jobs: key: ${{ matrix.build }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ matrix.build }}-cargo-index- + - name: Install Rust run: | rustup update ${{ matrix.rust }} --no-self-update