From a179227bf1e07103dc343ac33e0e55c069612a63 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 15 Apr 2025 13:51:18 +0100
Subject: [PATCH] Revert "Load gpg key without external action (#4784)" (#4800)

This reverts commit 634651859bfdf48dcb7cde0974aec3f430353b81.
---
 .github/workflows/release-make.yml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release-make.yml b/.github/workflows/release-make.yml
index b0f2e1ba8..8b1c24a26 100644
--- a/.github/workflows/release-make.yml
+++ b/.github/workflows/release-make.yml
@@ -58,18 +58,11 @@ jobs:
             - name: Load GPG key
               id: gpg
               if: inputs.gpg-fingerprint
-              env:
-                  PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-                  PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-                  FINGERPRINT: ${{ inputs.gpg-fingerprint }}
-              run: |
-                  # Import the private key from the GH secrets
-                  echo "$PRIVATE_KEY" | gpg --import --batch --passphrase "$PASSPHRASE" -
-                  # For debugging, show the contents of the keyring
-                  gpg --list-keys --list-options show-unusable-subkeys=yes --with-subkey-fingerprint $FINGERPRINT
-                  # Extract the email address
-                  EMAIL=$(gpg --list-keys --with-colons $FINGERPRINT | head -n1 | awk -F: '$1=="uid" {match($10, /<([^>]+)>/, a); print a[1]}')
-                  echo "email=$EMAIL" >> $GITHUB_OUTPUT
+              uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6
+              with:
+                  gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+                  passphrase: ${{ secrets.GPG_PASSPHRASE }}
+                  fingerprint: ${{ inputs.gpg-fingerprint }}
 
             - name: Get draft release
               id: draft-release