Merge main into v2

greenbone · May 8, 2023 · 351eca7 · 351eca7
2 parents 125a8b6 + 2693507
commit 351eca7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/mattermost-notify/action.yml b/mattermost-notify/action.yml
@@ -25,8 +25,8 @@ runs:
     - name: Virtual Environment
       id: virtualenv
       run: |
-        echo "path=${{ github.action_path }}/${{ github.action }}-venv" >> $GITHUB_OUTPUT
-        echo "name=${{ github.action }}-venv" >> $GITHUB_OUTPUT
+        echo "path=${{ github.action_path }}/mattermost-notify-venv" >> $GITHUB_OUTPUT
+        echo "name=mattermost-notify-venv" >> $GITHUB_OUTPUT
       shell: bash
     - name: Cache Virtual Environment
       id: cache-virtualenv

diff --git a/release/action.yaml b/release/action.yaml
@@ -80,8 +80,8 @@ runs:
     - name: Virtual Environment
       id: virtualenv
       run: |
-        echo "path=${{ github.action_path }}/${{ github.action }}-venv" >> $GITHUB_OUTPUT
-        echo "name=${{ github.action }}-venv" >> $GITHUB_OUTPUT
+        echo "path=${{ github.action_path }}/release-action-venv" >> $GITHUB_OUTPUT
+        echo "name=release-action-venv" >> $GITHUB_OUTPUT
       shell: bash
     - name: Cache Virtual Environment
       id: cache-virtualenv
@@ -106,13 +106,6 @@ runs:
         user: ${{ inputs.github-user }}
         mail: ${{ inputs.github-user-mail }}
         token: ${{ inputs.github-user-token }}
-    - name: Import gpg key from secrets
-      run: |
-        echo -e "${{ inputs.gpg-key }}" >> tmp.file
-        gpg --pinentry-mode loopback --passphrase ${{ inputs.gpg-passphrase }} --import tmp.file
-        rm tmp.file
-      shell: bash
-      if: ${{ inputs.gpg-key }} && ${{ inputs.gpg-fingerprint }} && ${{ inputs.gpg-passphrase }}
 
       # Input parsing
     - name: Parse release-type

diff --git a/setup-pontos/action.yml b/setup-pontos/action.yml
@@ -34,6 +34,7 @@ runs:
         echo "activate=${{ inputs.virtualenv-path }}/bin/activate" >> $GITHUB_OUTPUT
       shell: bash
     - name: Set up Python ${{ inputs.python-version }}
+      id: python
       uses: actions/setup-python@v4
       with:
         python-version: ${{ inputs.python-version }}