diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-12 19:49:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 19:49:09 +0000 |
| commit | 3d13939260f565fe6fb176b15e23201aafc2d11e (patch) | |
| tree | 9dd2febf96ab469f00acea3418e1055acc15d999 | |
| parent | c518fe7f6ca1c9a15d7d822654303155c90ce695 (diff) | |
| parent | e99cb578c99ca574dff6073d673eef9bb96ef4e3 (diff) | |
| download | rust-3d13939260f565fe6fb176b15e23201aafc2d11e.tar.gz rust-3d13939260f565fe6fb176b15e23201aafc2d11e.zip | |
Merge #6208
6208: macOS: install GNU tar r=jonas-schievink a=jonas-schievink CI runs on macOS have started to fail due to https://github.com/actions/cache/issues/403. Use GNU tar instead of BSD tar to work around that. Co-authored-by: Jonas Schievink <jonas.schievink@ferrous-systems.com> Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
| -rw-r--r-- | .github/workflows/ci.yaml | 8 | ||||
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | bors.toml | 2 |
3 files changed, 10 insertions, 1 deletions
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)", ] |