From ffe5e717e3677d20dddf27861132f7d2c2d03e7b Mon Sep 17 00:00:00 2001
From: Ivan Zorin <ivan.a.zorin@gmail.com>
Date: Tue, 19 Dec 2023 07:33:21 +0300
Subject: [PATCH] push.yml: remove wildcards from keys

---
 .github/workflows/push.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 764659c9..89b974ef 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Install dependencies (apk)
-        run: apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash tar
+        run: apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash tar date
 
       - name: Install dependencies (python)
         run: python3 -m pip install bdflib
@@ -63,7 +63,7 @@ jobs:
         uses: actions/cache/save@v3
         with:
           path: source/Hexfile/${{ matrix.model }}.json
-          key: metadata-${{ matrix.model }}-${{ steps.get_date.outputs.CURRENT_DATE }}
+          key: metadata-${{ steps.get_date.outputs.CURRENT_DATE }}
 
 
   build_multi-lang:
@@ -79,7 +79,7 @@ jobs:
 
     steps:
       - name: Install dependencies (apk)
-        run: apk add --no-cache gcc-riscv-none-elf newlib-riscv-none-elf findutils python3 py3-pip make git bash musl-dev tar
+        run: apk add --no-cache gcc-riscv-none-elf newlib-riscv-none-elf findutils python3 py3-pip make git bash musl-dev tar date
       - name: Install dependencies (python)
         run: python3 -m pip install bdflib
 
@@ -123,7 +123,7 @@ jobs:
         uses: actions/cache/save@v3
         with:
           path: source/Hexfile/${{ matrix.model }}_multi-lang.json
-          key: metadata-${{ matrix.model }}_multi-lang-${{ steps.get_date.outputs.CURRENT_DATE }}
+          key: metadata_multi-lang-${{ steps.get_date.outputs.CURRENT_DATE }}
 
 
   upload_metadata:
@@ -135,23 +135,16 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: metadata
-          key: metadata-*-${{ needs.build.outputs.current_date }}
+          key: metadata-${{ needs.build.outputs.current_date }}
       - run: ls -R ; ls -R metadata || true
 
       - name: Restore cached JSONs from build_multi-lang
         uses: actions/cache/restore@v3
         with:
           path: metadata
-          key: metadata-*-${{ needs.build_multi-lang.outputs.current_date }}
+          key: metadata_multi-lang-${{ needs.build_multi-lang.outputs.current_date }}
       - run: ls -R ; ls -R metadata || true
 
-      - name: Restore cached JSONs by key wildcar
-        uses: actions/cache/restore@v3
-        with:
-          path: metadata_test
-          key: metadata-*
-      - run: ls -R ; ls -R metadata_test || true
-
       - name: Upload JSONs in bulk
         uses: actions/upload-artifact@v4
         with: