Use explicit restore/save steps for Windows Conda env cache

Update cache restore code in Windows Test workflow

Author: alexbaden

.github/workflows/build-windows.yml

@@ -43,21 +43,29 @@ jobs:
           Get-PSDrive
 
       - name: Restore Conda env cache
-        id: conda-cache
-        uses: actions/cache@v3
+        id: restore-conda-cache
+        uses: actions/cache/restore@v3
         with:
           path: |
             ${{ env.CONDA_ENV_PATH }}
-          key: ${{ env.RUN_STAMP }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-${{ env.DATE }}
+          key: ${{ env.RUN_STAMP }}-conda-windows-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-${{ env.DATE }}
           restore-keys: |
-            ${{ env.RUN_STAMP }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-
+            ${{ env.RUN_STAMP }}-conda-windows-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-
 
       - name: Update Conda env
         if: steps.conda-cache.cache-hit != 'true'
         run: |
           & $env:CONDA\condabin\conda.bat update conda
           & $env:CONDA\condabin\conda.bat env update -f omniscidb/scripts/mapd-deps-conda-windows-env.yml
 
+      - name: Save Conda env cache
+        id: save-conda-cache
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ${{ env.CONDA_ENV_PATH }}
+          key: ${{ env.RUN_STAMP }}-conda-windows-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-${{ env.DATE }}
+
       - name: Restore Maven cache
         uses: actions/cache@v3
         with:

.github/workflows/test-windows.yml

@@ -1,10 +1,10 @@
 name: Reusable test action on windows
 on:
-  workflow_call: 
+  workflow_call:
     inputs:
       name:
         type: string
-        default: 'gcc-cpu'
+        default: "gcc-cpu"
       cache-suffix:
         type: string
         required: true
@@ -32,14 +32,16 @@ jobs:
           dir
 
       - name: Restore Conda env cache
-        uses: actions/cache@v3
+        id: restore-conda-cache
+        uses: actions/cache/restore@v3
         with:
           path: |
             ${{ env.CONDA_ENV_PATH }}
-          key: ${{ env.RUN_STAMP }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-${{ inputs.cache-suffix }}
+          key: ${{ env.RUN_STAMP }}-conda-windows-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-${{ env.DATE }}
+          restore-keys: |
+            ${{ env.RUN_STAMP }}-conda-windows-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-
 
       - name: Run sanity tests
         if: inputs.test == 'sanity'
         run: |
           & $env:CONDA\condabin\conda.bat run --no-capture-output -n omnisci-dev omniscidb/scripts/conda/test.bat
-