diff --git a/.eslintignore b/.eslintignore index 9ff5c1c..8e1d2ba 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,3 +2,4 @@ lib/ dist/ node_modules/ coverage/ + diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 46d11e4..0606233 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -14,7 +14,7 @@ permissions: jobs: lint: name: Lint Codebase - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout @@ -45,4 +45,5 @@ jobs: VALIDATE_JSCPD: false VALIDATE_MARKDOWN: false VALIDATE_NATURAL_LANGUAGE: false - VALIDATE_JSON: true + SUPPRESS_FILE_TYPE_WARN: true + VALIDATE_JSON: false diff --git a/README.md b/README.md index f8395c1..467892c 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ For example workflow runs, check out our | licenses.copyleft.include | List of Copyleft licenses to append to the default list. Provide licenses as a comma-separated list. | Optional | - | | licenses.copyleft.exclude | List of Copyleft licenses to remove from default list. Provide licenses as a comma-separated list. | Optional | - | | licenses.copyleft.explicit | Explicit list of Copyleft licenses to consider. Provide licenses as a comma-separated list. | Optional | - | -| runtimeContainer | Runtime URL | Optional | `ghcr.io/scanoss/scanoss-py:v1.15.0` | +| runtimeContainer | Runtime URL | Optional | `ghcr.io/scanoss/scanoss-py:v1.19.0` | | skipSnippets | Skip the generation of snippets. (scanFiles option must be enabled) | Optional | `false` | | scanFiles | Enable or disable file and snippet scanning | Optional | `true` | | scanossSettings | Settings file to use for scanning. See the SCANOSS settings [documentation](https://scanoss.readthedocs.io/projects/scanoss-py/en/latest/#settings-file) | Optional | `true` | diff --git a/__tests__/copyleft-argument-builder.test.ts b/__tests__/copyleft-argument-builder.test.ts index 27ace18..13dd605 100644 --- a/__tests__/copyleft-argument-builder.test.ts +++ b/__tests__/copyleft-argument-builder.test.ts @@ -28,7 +28,7 @@ describe('CopyleftArgumentBuilder', () => { 'run', '-v', 'scanoss:/scanoss', - 'ghcr.io/scanoss/scanoss-py:v1.18.0', + RUNTIME_CONTAINER, 'inspect', 'copyleft', '--input', @@ -48,7 +48,7 @@ describe('CopyleftArgumentBuilder', () => { 'run', '-v', 'scanoss:/scanoss', - 'ghcr.io/scanoss/scanoss-py:v1.18.0', + RUNTIME_CONTAINER, 'inspect', 'copyleft', '--input', @@ -68,7 +68,7 @@ describe('CopyleftArgumentBuilder', () => { 'run', '-v', 'scanoss:/scanoss', - 'ghcr.io/scanoss/scanoss-py:v1.18.0', + RUNTIME_CONTAINER, 'inspect', 'copyleft', '--input', diff --git a/src/services/scan.service.ts b/src/services/scan.service.ts index f235d5a..d1a8330 100644 --- a/src/services/scan.service.ts +++ b/src/services/scan.service.ts @@ -338,7 +338,8 @@ export class ScanService { return []; } } - return []; + // Force scanoss.py to not load the settings.json file + return ['-stf']; } private async parseResult(): Promise {