Merge branch 'master' of https://github.com/fsd-nodejs/service-mw2

fsd-nodejs · Jun 8, 2021 · f525ae5 · f525ae5
2 parents 6cc227f + bdef730
commit f525ae5
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -51,19 +51,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-
-    - name: Cache node modules
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-node-modules
-      with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
 
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
@@ -79,9 +66,25 @@ jobs:
         DATABASE_PASSWORD: password
         DATABASE_SCRIPT: ./src/database/init.sql
 
-    - run: npm install
+    - name: Cache node modules
+      uses: actions/cache@v2
+      env:
+        cache-name: cache-node-modules
+      with:
+        # npm cache files are stored in `~/.npm` on Linux/macOS
+        path: node_modules
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-build-${{ env.cache-name }}-
+          ${{ runner.os }}-build-
+          ${{ runner.os }}-
+
+    - name: Install Dependencies
+      if: steps.cache.outputs.cache-hit != 'true'
+      run: npm install
 
-    - run: npm run ci
+    - name: Run Tests
+      run: npm run ci
       env:
         CI: true
         # mysql