Update CI

myrotvorets · Dec 13, 2021 · c46246a · c46246a
1 parent 709576c
commit c46246a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 57 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -34,7 +34,8 @@ jobs:
     if: ${{ !startsWith(github.ref, 'refs/heads/') || !needs.prepare.outputs.head_tag }}
     strategy:
       matrix:
-        node_version: ['14']
+        node_version:
+          - 'lts/*'
 
     steps:
       - name: Checkout
@@ -45,9 +46,7 @@ jobs:
         with:
           node-version: ${{ matrix.node_version }}
           registry-url: https://npm.pkg.github.com
-
-      - name: Update npm
-        run: npm i -g npm@latest
+          cache: npm
 
       - name: Install dependencies
         run: npm ci --ignore-scripts

diff --git a/.github/workflows/package-audit.yml b/.github/workflows/package-audit.yml
@@ -2,74 +2,28 @@ name: Package Audit
 
 on:
   push:
-    branches:
-      - master
     paths:
       - package.json
       - package-lock.json
   pull_request:
-    branches:
-      - '**:**'
     paths:
       - package.json
       - package-lock.json
   workflow_dispatch:
 
 jobs:
   audit-npm:
+    name: NPM Audit
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node_version: ["14"]
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2.4.0
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v2.5.0
-        with:
-          node-version: ${{ matrix.node_version }}
-
-      - name: Run audit
-        run: npm audit --production
+      - name: Audit with NPM
+        uses: myrotvorets/composite-actions/node-package-audit@master
 
   audit-retire:
+    name: RetireJS Check
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node_version: ["14"]
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2.4.0
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v2.5.0
-        with:
-          node-version: ${{ matrix.node_version }}
-          registry-url: https://npm.pkg.github.com
-
-      - name: Cache node modules
-        uses: actions/cache@v2.1.7
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node_version }}-
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-
-      - name: Install dependencies
-        run: npm ci --ignore-scripts
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install retire.js
-        run: npm i -g retire
-
-      - name: Run audit
-        run: retire -n
+      - name: Audit with Retire.js
+        uses: myrotvorets/composite-actions/node-package-audit-retirejs@master
diff --git a/test/wpapi.test.ts b/test/wpapi.test.ts
@@ -6,7 +6,7 @@ import type { PostData } from '../src/lib/types';
 
 jest.mock('fetch-h2');
 
-const mockedFetch = f.fetch as jest.MockedFunction<typeof f.fetch>;
+const mockedFetch = f.fetch as jest.MockedFunction<typeof f.fetch>; // NOSONAR
 const { Response } = jest.requireActual<typeof f>('fetch-h2');
 
 describe('getPosts', () => {