Skip to content

Commit e7ea4ea

Browse files
authored
.ci/gpg: fix create-keyring.sh script to fix gpg signing releases (#290)
Signed-off-by: Joe Lanford <[email protected]>
1 parent 00a20d5 commit e7ea4ea

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

Diff for: .ci/gpg/create-keyring.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,24 @@ declare -r SECRING_AUTO="${GPG_HOME}/secring.auto"
1414
declare -r PUBRING_AUTO="${GPG_HOME}/pubring.auto"
1515

1616
mkdir -p "$GPG_HOME"
17+
chmod 700 "$GPG_HOME"
1718
cp "${DIR}"/*.auto* "${GPG_HOME}"
1819

20+
echo -e "\nImporting public keys..."
21+
{ gpg --home "${GPG_HOME}" --import "${PUBRING_AUTO}" ; } || { err_exit "Could not import public key into gpg." ; }
22+
echo "Success!"
23+
1924
echo -e "\nDecrypting secret key..."
2025
{
2126
# $GPG_PASSWORD is taken from the script's env (injected by CI).
22-
echo $GPG_PASSWORD | gpg --decrypt \
23-
--pinentry-mode loopback --batch \
27+
echo $GPG_PASSWORD | gpg --home "${GPG_HOME}" --decrypt \
28+
--pinentry-mode loopback --yes \
2429
--passphrase-fd 0 \
2530
--output "${SECRING_AUTO}" \
2631
"${SECRING_AUTO}".gpg ; \
2732
} || { err_exit "Failed to decrypt secret key." ; }
2833
echo "Success!"
2934

30-
echo -e "\nImporting keys..."
31-
{ gpg --home "${GPG_HOME}" --import "${PUBRING_AUTO}" ; } || { err_exit "Could not import public key into gpg." ; }
35+
echo -e "\nImporting private keys..."
3236
{ gpg --home "${GPG_HOME}" --import "${SECRING_AUTO}" ; } || { err_exit "Could not import secret key into gpg." ; }
3337
echo "Success!"

Diff for: testdata/hybrid/memcached-operator/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
require (
66
github.com/onsi/ginkgo/v2 v2.13.0
77
github.com/onsi/gomega v1.30.0
8-
github.com/operator-framework/helm-operator-plugins v0.1.2
8+
github.com/operator-framework/helm-operator-plugins v0.1.3
99
k8s.io/apimachinery v0.28.5
1010
k8s.io/client-go v0.28.5
1111
sigs.k8s.io/controller-runtime v0.16.3

Diff for: testdata/hybrid/memcached-operator/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
285285
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
286286
github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
287287
github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
288-
github.com/operator-framework/helm-operator-plugins v0.1.2 h1:gMPdJluw2NGxDURBpcLHJhWWXERCG095iHZUmACoXeE=
289-
github.com/operator-framework/helm-operator-plugins v0.1.2/go.mod h1:f/AR6r2DiSRK5zv9MD+NgWbayP6qDbQMw+unFuw0rPQ=
288+
github.com/operator-framework/helm-operator-plugins v0.1.3 h1:nwl9K1Pq0NZmanpEF/DYO00S7QO/iAmEdRIuLROrYpk=
289+
github.com/operator-framework/helm-operator-plugins v0.1.3/go.mod h1:f/AR6r2DiSRK5zv9MD+NgWbayP6qDbQMw+unFuw0rPQ=
290290
github.com/operator-framework/operator-lib v0.12.0 h1:OzpMU5N7mvFgg/uje8FUUeD24Ahq64R6TdN25uswCYA=
291291
github.com/operator-framework/operator-lib v0.12.0/go.mod h1:ClpLUI7hctEF7F5DBe/kg041dq/4NLR7XC5tArY7bG4=
292292
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=

0 commit comments

Comments
 (0)