From 8d10d1ff0fbc338adca7e234adbf16005f0359d1 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Sat, 15 Jan 2022 00:03:58 +0200
Subject: [PATCH] CI: separate caches for Boost and ICU

---
 .github/workflows/ballfield.yml | 16 ++++++++++++----
 .github/workflows/sdl2-demo.yml | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ballfield.yml b/.github/workflows/ballfield.yml
index 12b2b90fd..bd85e4fd6 100644
--- a/.github/workflows/ballfield.yml
+++ b/.github/workflows/ballfield.yml
@@ -65,22 +65,30 @@ jobs:
         id: icu-rev
         run: echo "::set-output name=ICU_REV::`git -C project/jni/iconv/src rev-parse HEAD`"
 
-      - name: Copy precompiled libraries from cache
+      - name: Copy Boost libraries from cache
         uses: actions/cache@v2
-        id: cache
+        id: cache-boost
         with:
           # The same SDL revision will produce the same libraries
-          key: ${{steps.boost-rev.outputs.BOOST_REV}}-${{steps.icu-rev.outputs.ICU_REV}}
+          key: ${{steps.boost-rev.outputs.BOOST_REV}}
           path: |
             build-android/project/jni/boost/include
             build-android/project/jni/boost/lib
+
+      - name: Copy ICU libraries from cache
+        uses: actions/cache@v2
+        id: cache-icu
+        with:
+          # The same SDL revision will produce the same libraries
+          key: ${{steps.icu-rev.outputs.ICU_REV}}
+          path: |
             build-android/project/jni/iconv/include
             build-android/project/jni/iconv/lib
             build-android/project/jni/icuuc/include
             build-android/project/jni/icuuc/lib
 
       - name: Touch cached file timestamps
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: steps.cache-boost.outputs.cache-hit == 'true' || steps.cache-icu.outputs.cache-hit == 'true'
         working-directory: build-android
         run: >
           touch
diff --git a/.github/workflows/sdl2-demo.yml b/.github/workflows/sdl2-demo.yml
index 7a9bded62..2b2ee665c 100644
--- a/.github/workflows/sdl2-demo.yml
+++ b/.github/workflows/sdl2-demo.yml
@@ -65,22 +65,30 @@ jobs:
         id: icu-rev
         run: echo "::set-output name=ICU_REV::`git -C project/jni/iconv/src rev-parse HEAD`"
 
-      - name: Copy precompiled libraries from cache
+      - name: Copy Boost libraries from cache
         uses: actions/cache@v2
-        id: cache
+        id: cache-boost
         with:
           # The same SDL revision will produce the same libraries
-          key: ${{steps.boost-rev.outputs.BOOST_REV}}-${{steps.icu-rev.outputs.ICU_REV}}
+          key: ${{steps.boost-rev.outputs.BOOST_REV}}
           path: |
             build-android/project/jni/boost/include
             build-android/project/jni/boost/lib
+
+      - name: Copy ICU libraries from cache
+        uses: actions/cache@v2
+        id: cache-icu
+        with:
+          # The same SDL revision will produce the same libraries
+          key: ${{steps.icu-rev.outputs.ICU_REV}}
+          path: |
             build-android/project/jni/iconv/include
             build-android/project/jni/iconv/lib
             build-android/project/jni/icuuc/include
             build-android/project/jni/icuuc/lib
 
       - name: Touch cached file timestamps
-        if: steps.cache.outputs.cache-hit == 'true'
+        if: steps.cache-boost.outputs.cache-hit == 'true' || steps.cache-icu.outputs.cache-hit == 'true'
         working-directory: build-android
         run: >
           touch