From 2c23da74b7e2226d5092da51c8bae22c715ba287 Mon Sep 17 00:00:00 2001
From: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
Date: Sun, 11 Apr 2021 18:37:35 +0100
Subject: [PATCH] ci: fix macOS cache

---
 .github/workflows/ci.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8fde066286..0e35fabc880 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,10 +69,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      # macOS: install gnu-tar because BSD tar is buggy for github actions
+      # https://github.com/actions/cache/issues/403
+      - name: Install GNU tar (Macos)
+        if: matrix.os == 'macOS-latest'
+        run: |
+          brew install gnu-tar
+          echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
+
       - uses: actions/cache@v2
-        # macOS seems to have a problem when the proc_macro_hack crates are cached.
-        # We can cache macOS in CI once we drop support for Rust older than 1.45
-        if: matrix.platform.os != 'macOS-latest'
         with:
           path: |
             ~/.cargo/registry