Skip to content

Commit 6d091b0

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

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

.github/workflows/release.yml

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

30-
- name: Export legacy GPG keyring for chart-releaser
30+
- name: Export GPG keyring for chart-releaser (GPG 2.x compatible)
3131
run: |
32-
mkdir -p gpg-legacy
32+
mkdir -p gpg-keyring
3333
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
4034
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 }}"
35+
--passphrase "$GPG_PASSPHRASE" \
36+
--export-secret-keys "${{ steps.import_gpg.outputs.keyid }}" \
37+
> gpg-keyring/secring.gpg
38+
39+
gpg --batch --yes \
40+
--export "${{ steps.import_gpg.outputs.keyid }}" \
41+
> gpg-keyring/pubring.gpg
42+
env:
43+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
4444

4545
- name: Prepare for Chart Releaser
4646
run: |
@@ -49,12 +49,12 @@ jobs:
4949
cat <<EOF > .cr.yaml
5050
sign: true
5151
key: "${{ steps.import_gpg.outputs.keyid }}"
52-
keyring: "gpg-legacy/pubring.gpg"
53-
secret-keyring: "gpg-legacy/secring.gpg"
52+
keyring: "gpg-keyring/pubring.gpg"
53+
secret-keyring: "gpg-keyring/secring.gpg"
5454
passphrase-file: "passphrase.txt"
5555
EOF
5656
env:
57-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
57+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
5858

5959
- name: Run chart-releaser
6060
uses: helm/[email protected]

0 commit comments

Comments
 (0)