Skip to content

Commit

Permalink
Changes linter.yml file
Browse files Browse the repository at this point in the history
  • Loading branch information
agustingroh committed Dec 20, 2024
1 parent bf275ec commit 66815e3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ lib/
dist/
node_modules/
coverage/

5 changes: 3 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
jobs:
lint:
name: Lint Codebase
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
6 changes: 3 additions & 3 deletions __tests__/copyleft-argument-builder.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('CopyleftArgumentBuilder', () => {
'run',
'-v',
'scanoss:/scanoss',
'ghcr.io/scanoss/scanoss-py:v1.18.0',
RUNTIME_CONTAINER,
'inspect',
'copyleft',
'--input',
Expand All @@ -48,7 +48,7 @@ describe('CopyleftArgumentBuilder', () => {
'run',
'-v',
'scanoss:/scanoss',
'ghcr.io/scanoss/scanoss-py:v1.18.0',
RUNTIME_CONTAINER,
'inspect',
'copyleft',
'--input',
Expand All @@ -68,7 +68,7 @@ describe('CopyleftArgumentBuilder', () => {
'run',
'-v',
'scanoss:/scanoss',
'ghcr.io/scanoss/scanoss-py:v1.18.0',
RUNTIME_CONTAINER,
'inspect',
'copyleft',
'--input',
Expand Down
3 changes: 2 additions & 1 deletion src/services/scan.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<ScannerResults> {
Expand Down

0 comments on commit 66815e3

Please sign in to comment.