Merge pull request #471 from jiaqiluo/fix-master-6

rancher · Oct 16, 2024 · 3a988df · 3a988df
2 parents d258575 + 31ea737
commit 3a988df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
@@ -39,10 +39,8 @@ jobs:
           echo "Importing gpg key"
           echo -n "$GPG_KEY" | base64 --decode | gpg --import --batch >/dev/null
           
-          # Print the list of secret key
-          gpg --list-secret-keys --with-colons
-          # Extract only the first full fingerprint from the list of secret keys
-          GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/ {print $10; exit}')
+          # Extract the correct secret subkey fingerprint
+          GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^ssb/ {found=1} found && /^fpr/ {print $10; exit}')
           echo "Extracted GPG Key ID: $GPG_KEY_ID"
           
           # Automatically trust the key by creating a trust level entry for the key (ultimate trust)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -39,10 +39,8 @@ jobs:
           echo "Importing gpg key"
           echo -n "$GPG_KEY" | base64 --decode | gpg --import --batch >/dev/null
           
-          # Print the list of secret key
-          gpg --list-secret-keys --with-colons
-          # Extract only the first full fingerprint from the list of secret keys
-          GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/ {print $10; exit}')
+          # Extract the correct secret subkey fingerprint
+          GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^ssb/ {found=1} found && /^fpr/ {print $10; exit}')
           echo "Extracted GPG Key ID: $GPG_KEY_ID"
           
           # Automatically trust the key by creating a trust level entry for the key (ultimate trust)