Skip to content

Commit 3d13939

Browse files
bors[bot]Jonas Schievinkjonas-schievink
authored
Merge #6208
6208: macOS: install GNU tar r=jonas-schievink a=jonas-schievink CI runs on macOS have started to fail due to actions/cache#403. Use GNU tar instead of BSD tar to work around that. Co-authored-by: Jonas Schievink <[email protected]> Co-authored-by: Jonas Schievink <[email protected]>
2 parents c518fe7 + e99cb57 commit 3d13939

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ jobs:
4242
if: matrix.os == 'windows-latest'
4343
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
4444

45+
# Work around https://github.com/actions/cache/issues/403 by using GNU tar
46+
# instead of BSD tar.
47+
- name: Install GNU tar
48+
if: matrix.os == 'macos-latest'
49+
run: |
50+
brew install gnu-tar
51+
echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV
52+
4553
- name: Install Rust toolchain
4654
uses: actions-rs/toolchain@v1
4755
with:

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bors.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
status = [
22
"Rust (ubuntu-latest)",
33
"Rust (windows-latest)",
4-
# "Rust (macos-latest)",
4+
"Rust (macos-latest)",
55
"TypeScript (ubuntu-latest)",
66
"TypeScript (windows-latest)",
77
]

0 commit comments

Comments
 (0)