ci: simplify caching mechanism

nock · Feb 5, 2020 · be0e181 · be0e181
1 parent 3992dd2
commit be0e181
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -96,24 +96,12 @@ jobs:
         id: npm-cache
         run: |
           echo "::set-output name=dir::$(npm config get cache)"
-      # The following two steps can be greatly simplified once
-      # https://github.com/actions/cache/issues/39 is fixed.
-      - if: runner.os != 'Windows'
-        name: Cache npm dependencies
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.npm-cache.outputs.dir }}
-          key: |
-            npm-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            npm-${{ runner.os }}-
-      - if: runner.os == 'Windows'
-        name: Cache npm dependencies
+      - name: Cache npm dependencies
         uses: actions/cache@v1
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: |
-            npm-${{ runner.os }}-${{ hashFiles('**\package-lock.json') }}
+            npm-${{ runner.os }}-${{ hashFiles('./package-lock.json') }}
           restore-keys: |
             npm-${{ runner.os }}-
       - name: Install dependencies