Skip to content

Commit 2c1ab6e

Browse files
Update GitHub Deploy config
1 parent 85a46ce commit 2c1ab6e

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

.github/workflows/deploy.yml

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,15 @@ jobs:
1616
- name: Import GPG Key
1717
run: |
1818
echo "$GPG_PRIVATE_KEY" | gpg --batch --import
19-
KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^sec:/ { print $5 }')
20-
echo "Using GPG key: $KEY_ID"
21-
echo "GPG_KEY_ID=$KEY_ID" >> $GITHUB_ENV
22-
echo "use-agent" >> ~/.gnupg/gpg.conf
23-
echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
24-
echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf
25-
echo RELOADAGENT | gpg-connect-agent
26-
shell: bash
19+
gpg --list-secret-keys --keyid-format LONG || echo "No secret keys found"
2720
env:
2821
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
2922

30-
# - name: Set up GPG
31-
# run: |
32-
# echo "$GPG_PRIVATE_KEY" | gpg --batch --import
33-
# echo "$GPG_OWNERTRUST" | gpg --batch --import-ownertrust
34-
# env:
35-
# GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
36-
# GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
37-
38-
# - name: Verify GPG Key
39-
# run: gpg --list-secret-keys --keyid-format LONG
23+
- name: Extract GPG Key ID
24+
run: |
25+
KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^sec:/ { print $5 }')
26+
echo "GPG_KEY_ID=$KEY_ID" >> $GITHUB_ENV
27+
shell: bash
4028

4129
- name: Debug GPG Key Import
4230
run: |
@@ -45,12 +33,13 @@ jobs:
4533
env:
4634
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
4735

48-
- name: Set Default GPG Key and Verify
36+
- name: Set Default GPG Key
4937
run: |
50-
echo "$GPG_PRIVATE_KEY" | gpg --batch --import
51-
gpg --default-key ${{ secrets.GPG_KEY_ID }} --list-secret-keys --keyid-format LONG
52-
env:
53-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
38+
echo "default-key ${{ env.GPG_KEY_ID }}" >> ~/.gnupg/gpg.conf
39+
echo "use-agent" >> ~/.gnupg/gpg.conf
40+
echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
41+
echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf
42+
echo RELOADAGENT | gpg-connect-agent
5443
5544
- name: Set GPG_TTY
5645
run: echo "GPG_TTY=$(tty)" >> $GITHUB_ENV

0 commit comments

Comments
 (0)