Merge pull request #468 from jiaqiluo/fix-master-3

rancher · Oct 15, 2024 · 25c89b1 · 25c89b1
2 parents 7343b76 + 5363134
commit 25c89b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
@@ -41,8 +41,8 @@ jobs:
           # Extract the key ID from the list of secret keys
           GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^sec/ {print $5}')
           echo "Extracted GPG Key ID: $GPG_KEY_ID"
-          # Automatically trust the key
-          echo -e "5\ny\n" | gpg --command-fd 0 --expert --edit-key "$GPG_KEY_ID" trust quit
+          # Automatically trust the key by creating a trust level entry for the key (ultimate trust)
+          echo -e "$GPG_KEY_ID:6:" | gpg --import-ownertrust
           echo "signing SHASUM file"
           VERSION_NO_V=$(echo ${{ github.ref_name }} | sed "s/^[v|V]//")
           SHASUM_FILE=dist/artifacts/${{ github.ref_name }}/terraform-provider-rke_"$VERSION_NO_V"_SHA256SUMS

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -41,8 +41,8 @@ jobs:
           # Extract the key ID from the list of secret keys
           GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^sec/ {print $5}')
           echo "Extracted GPG Key ID: $GPG_KEY_ID"
-          # Automatically trust the key
-          echo -e "5\ny\n" | gpg --command-fd 0 --expert --edit-key "$GPG_KEY_ID" trust quit
+          # Automatically trust the key by creating a trust level entry for the key (ultimate trust)
+          echo -e "$GPG_KEY_ID:6:" | gpg --import-ownertrust
           echo "signing SHASUM file"
           VERSION_NO_V=$(echo ${{ github.ref_name }} | sed "s/^[v|V]//")
           SHASUM_FILE=dist/artifacts/${{ github.ref_name }}/terraform-provider-rke_"$VERSION_NO_V"_SHA256SUMS