From: Victor Julien <vjulien@oisf.net>
Date: Wed, 9 Oct 2024 16:54:37 +0000 (+0200)
Subject: github-action: share cargo cache for windows jobs
X-Git-Tag: suricata-7.0.8~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4d066f681a3547645d2108059e9e54921dc64be;p=thirdparty%2Fsuricata.git

github-action: share cargo cache for windows jobs

Modification by Jason Ish: Keep removal of duplicate checkout action
while resolving conflict.

(cherry picked from commit d574d88bcafa630e0a112322e8c2dbf66d9ec49a)
---

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 7d0cae1727..456c66e446 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -2411,8 +2411,7 @@ jobs:
         uses: actions/cache@v3.3.1
         with:
           path: ~/.cargo
-          key: ${{ github.job }}-cargo
-      - uses: actions/checkout@v3.5.3
+          key: windows-msys2-mingw64-cargo
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
@@ -2467,8 +2466,7 @@ jobs:
         uses: actions/cache@v3.3.1
         with:
           path: ~/.cargo
-          key: ${{ github.job }}-cargo
-      - uses: actions/checkout@v3.5.3
+          key: windows-msys2-mingw64-cargo
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
@@ -2511,8 +2509,7 @@ jobs:
         uses: actions/cache@v3.3.1
         with:
           path: ~/.cargo
-          key: ${{ github.job }}-cargo
-      - uses: actions/checkout@v3.5.3
+          key: windows-msys2-mingw64-cargo
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64