Merge pull request #16 from ii887522/develop

Fix not saving cache for libs
ii887522 · Jun 7, 2021 · 01692b0 · 01692b0
2 parents 212b514 + 9e19da8
commit 01692b0
Showing 1 changed file with 13 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,11 +32,15 @@ jobs:
             ~\AppData\Local\pip\Cache
             env
             ${{ steps.npm-cache.outputs.dir }}
-            libs
-          key: ${{ runner.os }}-pip-node-virtualenv-cpplint-${{ hashFiles('**/package-lock.json', 'build.js') }}
+          key: ${{ runner.os }}-pip-node-virtualenv-cpplint-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-pip-node-
             ${{ runner.os }}-
+      - name: Cache libs
+        uses: actions/cache@v2
+        with:
+          path: libs
+          key: ${{ runner.os }}-node-${{ hashFiles('build.js') }}
       - name: Use Python
         if: steps.cache.outputs.cache-hit != 'true'
         uses: actions/setup-python@v2
@@ -66,25 +70,11 @@ jobs:
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.node-version }}
-      - name: Get npm cache directory
-        id: npm-cache
-        run: echo "::set-output name=dir::$(npm config get cache)"
-      - name: Cache dependencies
+      - name: Cache libs
         uses: actions/cache@v2
         with:
-          path: |
-            ~\AppData\Local\pip\Cache
-            env
-            ${{ steps.npm-cache.outputs.dir }}
-            libs
-          key: ${{ runner.os }}-pip-node-virtualenv-cpplint-${{ hashFiles('**/package-lock.json', 'build.js') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-node-
-            ${{ runner.os }}-
+          path: libs
+          key: ${{ runner.os }}-node-${{ hashFiles('build.js') }}
       - name: Cache outputs
         id: outputs-cache
         uses: actions/cache@v2
@@ -129,18 +119,11 @@ jobs:
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
-      - name: Cache dependencies
+      - name: Cache libs
         uses: actions/cache@v2
         with:
-          path: |
-            ~\AppData\Local\pip\Cache
-            env
-            ${{ steps.npm-cache.outputs.dir }}
-            libs
-          key: ${{ runner.os }}-pip-node-virtualenv-cpplint-${{ hashFiles('**/package-lock.json', 'build.js') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-node-
-            ${{ runner.os }}-
+          path: libs
+          key: ${{ runner.os }}-node-${{ hashFiles('build.js') }}
       - name: Cache outputs
         id: outputs-cache
         uses: actions/cache@v2
@@ -181,8 +164,7 @@ jobs:
             ~\AppData\Local\pip\Cache
             env
             ${{ steps.npm-cache.outputs.dir }}
-            libs
-          key: ${{ runner.os }}-pip-node-virtualenv-cpplint-${{ hashFiles('**/package-lock.json', 'build.js') }}
+          key: ${{ runner.os }}-pip-node-virtualenv-cpplint-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-pip-node-
             ${{ runner.os }}-