From 1ed629b9272a200a81037486fb0b69c23b7b6375 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Fri, 18 Jun 2021 17:47:19 -0400
Subject: [PATCH] ci: make the GA cache platform-specific

because, e.g., zlib isn't used on linux but it used on windows.
---
 .github/workflows/ci.yml          | 12 ++++++------
 .github/workflows/gem-install.yml |  4 ++--
 .github/workflows/truffle.yml     |  2 +-
 .github/workflows/upstream.yml    |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6449a4f7bf..fb6c8d1399 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
         if: matrix.sys == 'disable'
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle install --local || bundle install
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
@@ -79,7 +79,7 @@ jobs:
         if: matrix.sys == 'disable'
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle install --local || bundle install
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
@@ -135,7 +135,7 @@ jobs:
         if: matrix.sys == 'disable'
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle install --local || bundle install
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
@@ -159,7 +159,7 @@ jobs:
         if: matrix.sys == 'disable'
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle install --local || bundle install
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
@@ -183,7 +183,7 @@ jobs:
         if: matrix.sys == 'disable'
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-macos-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
       - run: bundle exec rake test
@@ -211,7 +211,7 @@ jobs:
         if: matrix.sys == 'disable'
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-windows-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
       - run: bundle exec rake test
diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml
index 493d5d616a..693fe334b1 100644
--- a/.github/workflows/gem-install.yml
+++ b/.github/workflows/gem-install.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: ./scripts/test-gem-build gems ruby
       - uses: actions/upload-artifact@v2
@@ -110,7 +110,7 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: "./scripts/test-gem-build gems ${{matrix.plat}}"
       - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/truffle.yml b/.github/workflows/truffle.yml
index 721ee0f69a..262e5ca77f 100644
--- a/.github/workflows/truffle.yml
+++ b/.github/workflows/truffle.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle install --local || bundle install
       - run: bundle exec rake compile -- ${{matrix.flags}}
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index d2e5d7d779..05a0ecb5ca 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -87,7 +87,7 @@ jobs:
         if: matrix.sys == 'disable'
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-${{matrix.plat}}-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
       - run: bundle exec rake test
@@ -110,7 +110,7 @@ jobs:
         if: matrix.sys == 'disable'
         with:
           path: ports/archives
-          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
           restore-keys: tarballs-
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
       - run: bundle exec rake test:valgrind