From 738bfbb1f710d6df5dab5440fdc713ae21697403 Mon Sep 17 00:00:00 2001 From: Aidan McPhelim Date: Thu, 18 Apr 2024 17:18:03 +0100 Subject: [PATCH 1/2] fixed visualizer scanning --- .github/workflows/cve-scanning-node.yml | 25 +++++++++------------ .github/workflows/license-scanning-node.yml | 18 ++++++--------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/.github/workflows/cve-scanning-node.yml b/.github/workflows/cve-scanning-node.yml index 5d717c77..538c711e 100644 --- a/.github/workflows/cve-scanning-node.yml +++ b/.github/workflows/cve-scanning-node.yml @@ -3,13 +3,13 @@ name: CVE Scanning for Node.js on: workflow_dispatch: schedule: - - cron: '0 8,18 * * 1-5' + - cron: "0 8,18 * * 1-5" push: paths: - - '**/package.json' - - '**/package-lock.json' - - '.github/workflows/node-cve-ignore-list.xml' - - '.github/workflows/cve-scanning-node.yml' + - "**/package.json" + - "**/package-lock.json" + - ".github/workflows/node-cve-ignore-list.xml" + - ".github/workflows/cve-scanning-node.yml" jobs: node-modules-scan: @@ -18,10 +18,7 @@ jobs: continue-on-error: false strategy: matrix: - module-folder: [ - 'cli', - 'docs', - 'visualizer' ] + module-folder: ["cli", "docs"] steps: - name: Checkout uses: actions/checkout@v4 @@ -36,10 +33,10 @@ jobs: uses: dependency-check/Dependency-Check_Action@main id: Depcheck with: - project: '${{ matrix.module-folder }}' - path: '${{ matrix.module-folder }}' - format: 'HTML' - out: '${{ matrix.module-folder }}-reports' + project: "${{ matrix.module-folder }}" + path: "${{ matrix.module-folder }}" + format: "HTML" + out: "${{ matrix.module-folder }}-reports" args: > --suppression .github/node-cve-ignore-list.xml --nodeAuditSkipDevDependencies @@ -54,4 +51,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: Depcheck report ${{ env.UPNAME }} - path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports \ No newline at end of file + path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports diff --git a/.github/workflows/license-scanning-node.yml b/.github/workflows/license-scanning-node.yml index 598f44c2..e8ba4c91 100644 --- a/.github/workflows/license-scanning-node.yml +++ b/.github/workflows/license-scanning-node.yml @@ -2,24 +2,20 @@ name: License Scanning for Node.js on: schedule: - - cron: '0 8,18 * * 1-5' + - cron: "0 8,18 * * 1-5" push: paths: - - '**/package-json.lock' - - '**/package.json' - - '.github/workflows/license-scanning-node.yml' + - "**/package-json.lock" + - "**/package.json" + - ".github/workflows/license-scanning-node.yml" jobs: scan: runs-on: ubuntu-latest strategy: matrix: - node-version: ['20.x'] - module-folder: [ - 'cli', - 'docs', - 'visualizer' - ] + node-version: ["20.x"] + module-folder: ["cli", "docs"] steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} @@ -32,4 +28,4 @@ jobs: - run: npm install -g node-license-validator working-directory: ${{ matrix.module-folder }} - run: node-license-validator . --allow-licenses Apache-2.0 MIT BSD-2-Clause BSD BSD-3-Clause Unlicense ISC - working-directory: ${{ matrix.module-folder }} \ No newline at end of file + working-directory: ${{ matrix.module-folder }} From 605754af2ef80eb86c7770246314e69feeeb427b Mon Sep 17 00:00:00 2001 From: Aidan McPhelim Date: Thu, 18 Apr 2024 17:21:14 +0100 Subject: [PATCH 2/2] fixed quotes issue --- .github/workflows/cve-scanning-node.yml | 20 ++++++++++---------- .github/workflows/license-scanning-node.yml | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cve-scanning-node.yml b/.github/workflows/cve-scanning-node.yml index 538c711e..e603626e 100644 --- a/.github/workflows/cve-scanning-node.yml +++ b/.github/workflows/cve-scanning-node.yml @@ -3,13 +3,13 @@ name: CVE Scanning for Node.js on: workflow_dispatch: schedule: - - cron: "0 8,18 * * 1-5" + - cron: '0 8,18 * * 1-5' push: paths: - - "**/package.json" - - "**/package-lock.json" - - ".github/workflows/node-cve-ignore-list.xml" - - ".github/workflows/cve-scanning-node.yml" + - '**/package.json' + - '**/package-lock.json' + - '.github/workflows/node-cve-ignore-list.xml' + - '.github/workflows/cve-scanning-node.yml' jobs: node-modules-scan: @@ -18,7 +18,7 @@ jobs: continue-on-error: false strategy: matrix: - module-folder: ["cli", "docs"] + module-folder: ['cli', 'docs'] steps: - name: Checkout uses: actions/checkout@v4 @@ -33,10 +33,10 @@ jobs: uses: dependency-check/Dependency-Check_Action@main id: Depcheck with: - project: "${{ matrix.module-folder }}" - path: "${{ matrix.module-folder }}" - format: "HTML" - out: "${{ matrix.module-folder }}-reports" + project: '${{ matrix.module-folder }}' + path: '${{ matrix.module-folder }}' + format: 'HTML' + out: '${{ matrix.module-folder }}-reports' args: > --suppression .github/node-cve-ignore-list.xml --nodeAuditSkipDevDependencies diff --git a/.github/workflows/license-scanning-node.yml b/.github/workflows/license-scanning-node.yml index e8ba4c91..8ade4ac3 100644 --- a/.github/workflows/license-scanning-node.yml +++ b/.github/workflows/license-scanning-node.yml @@ -2,20 +2,20 @@ name: License Scanning for Node.js on: schedule: - - cron: "0 8,18 * * 1-5" + - cron: '0 8,18 * * 1-5' push: paths: - - "**/package-json.lock" - - "**/package.json" - - ".github/workflows/license-scanning-node.yml" + - '**/package-json.lock' + - '**/package.json' + - '.github/workflows/license-scanning-node.yml' jobs: scan: runs-on: ubuntu-latest strategy: matrix: - node-version: ["20.x"] - module-folder: ["cli", "docs"] + node-version: ['20.x'] + module-folder: ['cli', 'docs'] steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }}