Merge main into v2

greenbone · May 31, 2023 · 186a4e7 · 186a4e7
2 parents e835ea1 + cdaea53
commit 186a4e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/backport-pull-request/.pylintrc b/backport-pull-request/.pylintrc
@@ -465,4 +465,4 @@ valid-metaclass-classmethod-first-arg=mcs
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception
diff --git a/backport-pull-request/README.md b/backport-pull-request/README.md
@@ -16,6 +16,10 @@ on:
       - closed
       - labeled
 
+permissions:
+  pull-requests: write
+  contents: read
+
 jobs:
   backport:
     name: Backport Pull Requests
@@ -47,7 +51,7 @@ workflow file of the backport action.
 
 |Input Variable|Description| |
 |--------------|-----------|-|
-| token          | Token required to create the backport pull request          | Required |
+| token          | Token required to create the backport pull request          | Optional (default is `${{ github.token }}`) |
 | config         | TOML based configuration file for backporting pull requests | Optional (default is `backport.toml`) |
 | username       | GitHub user name to use for the backported commits          | Optional (by default github.actor is used) |
 | python-version | Python version to use for running the action                | Optional (default is `3.10`) |

diff --git a/backport-pull-request/action.yml b/backport-pull-request/action.yml
@@ -10,9 +10,9 @@ inputs:
     default: ${{ github.token }}
   username:
     description: "GitHub user name to use for the backported commits. By default github.actor is used."
+    default: ${{ github.actor }}
   python-version:
     description: "Python version to use for running the action"
-    required: false
     default: "3.10"
   poetry-version:
     description: "Use a specific poetry version. By default the latest release is used."