Skip to content

Commit 54fb3b7

Browse files
committed
update keyring generation step
1 parent aaa9c0b commit 54fb3b7

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

.github/workflows/release.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,25 @@ jobs:
2727
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
2828
passphrase: ${{ secrets.GPG_PASSPHRASE }}
2929

30-
- name: Export GPG keys for chart-releaser
30+
- name: Export legacy GPG keyring for chart-releaser
3131
run: |
3232
mkdir -p gpg-legacy
33-
# Export both public and private keys to a legacy keyring file
34-
gpg --export "${{ steps.import_gpg.outputs.keyid }}" > gpg-legacy/pubring.gpg
35-
gpg --export-secret-keys "${{ steps.import_gpg.outputs.keyid }}" > gpg-legacy/secring.gpg
33+
34+
# Export public key in legacy-compatible format
35+
gpg --no-default-keyring \
36+
--keyring ./gpg-legacy/pubring.gpg \
37+
--export "${{ steps.import_gpg.outputs.keyid }}"
38+
39+
# Export private key in legacy-compatible format
40+
gpg --batch --yes --pinentry-mode loopback \
41+
--no-default-keyring \
42+
--secret-keyring ./gpg-legacy/secring.gpg \
43+
--export-secret-keys "${{ steps.import_gpg.outputs.keyid }}"
3644
3745
- name: Prepare for Chart Releaser
3846
run: |
39-
# Create a passphrase file for chart-releaser to use for signing
4047
echo "$GPG_PASSPHRASE" > passphrase.txt
4148
42-
# Create the .cr.yaml config file using the key ID from the import step
4349
cat <<EOF > .cr.yaml
4450
sign: true
4551
key: "${{ steps.import_gpg.outputs.keyid }}"
@@ -48,8 +54,7 @@ jobs:
4854
passphrase-file: "passphrase.txt"
4955
EOF
5056
env:
51-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
52-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
57+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
5358

5459
- name: Run chart-releaser
5560
uses: helm/[email protected]

0 commit comments

Comments
 (0)