Merge main into v2

greenbone · Jun 30, 2023 · 6355e83 · 6355e83
2 parents 3005dfd + bc34c75
commit 6355e83
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/backport-pull-request/poetry.lock b/backport-pull-request/poetry.lock
diff --git a/download-artifact/poetry.lock b/download-artifact/poetry.lock
diff --git a/release/action.yaml b/release/action.yaml
@@ -167,7 +167,7 @@ runs:
       # Signing
     - name: Sign assets for released version
       uses: greenbone/actions/sign-release-files@v2
-      if: ${{ inputs.sign-release-files == 'true' }} && ${{ inputs.gpg-key }} && ${{ inputs.gpg-fingerprint }} && ${{ inputs.gpg-passphrase }}
+      if: inputs.sign-release-files == 'true' && inputs.gpg-key && inputs.gpg-fingerprint && inputs.gpg-passphrase
       with:
         python-version: ${{ inputs.python-version }}
         github-token: ${{ inputs.github-user-token }}

diff --git a/sign-release-files/action.yml b/sign-release-files/action.yml
@@ -36,6 +36,24 @@ runs:
   using: "composite"
   steps:
     # Setup
+    - name: Check gpg-key input
+      if: inputs.gpg-key == ''
+      run: |
+        echo "::error ::gpg-key input is missing."
+        exit 1
+      shell: bash
+    - name: Check gpg-fingerprint input
+      if: inputs.gpg-fingerprint == ''
+      run: |
+        echo "::error ::gpg-fingerprint input is missing."
+        exit 1
+      shell: bash
+    - name: Check gpg-passphrase input
+      if: inputs.gpg-passphrase == ''
+      run: |
+        echo "::error ::gpg-passphrase input is missing."
+        exit 1
+      shell: bash
     - name: Parse release-version if set (overwrite release-type)
       if: ${{ inputs.release-version }}
       run: |

diff --git a/trigger-workflow/poetry.lock b/trigger-workflow/poetry.lock