diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a19bc9ad3c2..77f2e2e168d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,6 +42,14 @@ jobs: 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 + # Work around https://github.com/actions/cache/issues/403 by using GNU tar + # instead of BSD tar. + - name: Install GNU tar + if: matrix.os == 'macos-latest' + run: | + brew install gnu-tar + echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV + - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: diff --git a/Cargo.lock b/Cargo.lock index fdb62e6ea42..320f70529f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +# asdasdasdasd [[package]] name = "addr2line" version = "0.13.0" diff --git a/bors.toml b/bors.toml index 4c980a24d3d..1f4eb510acb 100644 --- a/bors.toml +++ b/bors.toml @@ -1,7 +1,7 @@ status = [ "Rust (ubuntu-latest)", "Rust (windows-latest)", - # "Rust (macos-latest)", + "Rust (macos-latest)", "TypeScript (ubuntu-latest)", "TypeScript (windows-latest)", ]