Merge main into v2

greenbone · Jul 4, 2023 · 83eca86 · 83eca86
2 parents bf3993c + 08eaac8
commit 83eca86
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 31 deletions.
diff --git a/backport-pull-request/poetry.lock b/backport-pull-request/poetry.lock
diff --git a/dependency-review/action.yml b/dependency-review/action.yml
@@ -32,6 +32,7 @@ runs:
           BSD-3-Clause,
           BSD-2-Clause,
           MPL-2.0,
+          CC-BY-4.0,
           CC-BY-SA-4.0,
           BSD-2-Clause AND BSD-3-Clause,
           MIT OR Apache-2.0,

diff --git a/download-artifact/poetry.lock b/download-artifact/poetry.lock
diff --git a/lint-python/README.md b/lint-python/README.md
@@ -30,6 +30,7 @@ jobs:
 | cache | Cache dependencies by setting it to `"true"`. Leave unset or set to an other string then `"true"` to disable the cache. | Optional |
 | cache-dependency-path | Used to specify the path to dependency files. Supports wildcards or a list of file names for caching multiple dependencies. | Optional |
 | cache-poetry-installation | "Cache poetry and its dependencies. Default is `"true"`. Set to an other string then `"true"` to disable the cache." | Optional (default: `"true"`) |
-| install-dependencies | Install project dependencies. Default is `"true"`. Set to an other string then `"true"` to not install the dependencies. | Optional (default: `"true"`)
+| install-dependencies | Install project dependencies. Default is `"true"`. Set to an other string then `"true"` to not install the dependencies. | Optional (default: `"true"`) |
+| linter | Linter to use. Default is 'pylint'. \[pylint, ruff\]| Optional (default: `"pylint")`|
 | working-directory | Working directory where to run the action | Optional (default is `${{ github.workspace }}`) |
 
diff --git a/lint-python/action.yaml b/lint-python/action.yaml
@@ -27,6 +27,9 @@ inputs:
   working-directory:
     description: "Working directory where to run the action"
     default: ${{ github.workspace }}
+  linter:
+    description: "Linter to use. Default is 'pylint'."
+    default: "pylint"
 
 branding:
   icon: "package"
@@ -46,15 +49,11 @@ runs:
         cache-poetry-installation: ${{ inputs.cache-poetry-installation }}
         install-dependencies: ${{ inputs.install-dependencies }}
         working-directory: ${{ inputs.working-directory }}
-    - run: echo "Running black"
-      shell: bash
     - run: poetry run black --check --diff ${{ inputs.packages }}
       shell: bash
       name: Check with black
       working-directory: ${{ inputs.working-directory }}
-    - run: echo "Running pylint"
-      shell: bash
-    - run: poetry run pylint ${{ inputs.packages }}
+    - run: poetry run ${{ inputs.linter }} ${{ inputs.packages }}
       shell: bash
-      name: Check with pylint
+      name: Check with ${{ inputs.linter }}
       working-directory: ${{ inputs.working-directory }}
diff --git a/trigger-workflow/poetry.lock b/trigger-workflow/poetry.lock