Browse Source

Tweak CI cache (#2904)

Enable cache on Windows and fix cache directory to work on all OS'es
XhmikosR 4 years ago
parent
commit
7d42f7cceb
2 changed files with 12 additions and 3 deletions
  1. 6 2
      .github/workflows/ci.yml
  2. 6 1
      .github/workflows/docs.yml

+ 6 - 2
.github/workflows/ci.yml

@@ -36,11 +36,15 @@ jobs:
         with:
         with:
           node-version: ${{ matrix.node }}
           node-version: ${{ matrix.node }}
 
 
+      - name: Get npm cache directory
+        id: npm-cache
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+
       - name: Set up npm cache
       - name: Set up npm cache
         uses: actions/cache@v2
         uses: actions/cache@v2
-        if: ${{ !startsWith(runner.os, 'windows') }}
         with:
         with:
-          path: ~/.npm
+          path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-v${{ env.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}}
           key: ${{ runner.os }}-node-v${{ env.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}}
           restore-keys: |
           restore-keys: |
             ${{ runner.OS }}-node-v${{ env.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
             ${{ runner.OS }}-node-v${{ env.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}

+ 6 - 1
.github/workflows/docs.yml

@@ -34,10 +34,15 @@ jobs:
       - name: Disable gem docs
       - name: Disable gem docs
         run: 'echo "gem: --no-document" > ~/.gemrc'
         run: 'echo "gem: --no-document" > ~/.gemrc'
 
 
+      - name: Get npm cache directory
+        id: npm-cache
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+
       - name: Set up npm cache
       - name: Set up npm cache
         uses: actions/cache@v2
         uses: actions/cache@v2
         with:
         with:
-          path: ~/.npm
+          path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-v${{ env.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}}
           key: ${{ runner.os }}-node-v${{ env.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}}
           restore-keys: |
           restore-keys: |
             ${{ runner.OS }}-node-v${{ env.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
             ${{ runner.OS }}-node-v${{ env.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}