Skip to content

Commit 39337c5

Browse files
symfony-swoole-botRastusik
authored andcommitted
fix(gpg): attempt to use gpg keys properly
1 parent b3d4ea3 commit 39337c5

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ services:
1414
GH_COMMITER_NAME: "${GH_COMMITER_NAME:-openswoole-bundle-bot}"
1515
GH_COMMITER_EMAIL: "${GH_COMMITER_EMAIL:-147276322+openswoole-bundle-bot@users.noreply.github.com}"
1616
GH_COMMITER_SIGNING_KEY: "${GH_COMMITER_SIGNING_KEY:-xxxx}"
17+
GH_COMMITER_PGP_PRIVATE_KEY: "${GH_COMMITER_PGP_PRIVATE_KEY:-xxxx}"
1718
GH_TOKEN: "${GH_TOKEN:-xxxxxxxx}"
1819
GH_RELEASE_DRAFT: "${GH_RELEASE_DRAFT:-true}"
1920
GH_RELEASE_PRERELEASE: "${GH_RELEASE_PRERELEASE:-false}"
2021
volumes:
21-
- "~/.gnupg:/root/.gnupg_host:r"
2222
- "./.git:/usr/src/app/.git:rw"
2323
- "./CHANGELOG.md:/usr/src/app/CHANGELOG.md:rw"
2424
- "./release-version.sh:/usr/local/bin/release-version:rw"

release-version.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,8 @@ $(conventional-changelog | awk 'NR > 1 { print }')
186186

187187
if [ "0" = "$DRY_RUN" ]; then
188188
# init and run GPG
189-
mkdir -p /root/.gnupg
190-
cp -R /root/.gnupg_host/* /root/.gnupg/
191-
gpg-agent --verbose --daemon --log-file /tmp/gpg-agent.log --allow-preset-passphrase --default-cache-ttl=31536000
189+
echo "${GH_COMMITER_PGP_PRIVATE_KEY}" | \
190+
gpg --no-default-keyring --keyring trustedkeys.gpg --import
192191

193192
# commit changes with GPG signature
194193
git add CHANGELOG.md

0 commit comments

Comments
 (0)