Skip to content

Commit 0d60e3a

Browse files
authored
Fix: Copy GPG secring to jedis-compatibility in Java CD workflow (#4723)
fix(java-cd): copy secring.gpg to jedis-compatibility for signing Signed-off-by: jbrinkman <[email protected]>
1 parent f0c9818 commit 0d60e3a

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

.github/workflows/java-cd.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
export PLATFORM_MATRIX=$(jq 'map(
4040
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["maven"])))
4141
| .RUNNER = (
42-
if (.RUNNER | type == "array")
43-
then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end))
44-
else (if .RUNNER == "ephemeral" then "persistent" else .RUNNER end)
42+
if (.RUNNER | type == "array")
43+
then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end))
44+
else (if .RUNNER == "ephemeral" then "persistent" else .RUNNER end)
4545
end
4646
)
4747
)' < .github/json_matrices/build-matrix.json | jq -c .)
@@ -129,11 +129,22 @@ jobs:
129129
${{ runner.os }}-gradle-cd-
130130
${{ runner.os }}-gradle-
131131
132-
- name: Create secret key ring file
132+
- name: Create secret key ring file for all Java submodules
133133
working-directory: java/client
134134
run: |
135+
# Decode the provided base64 GPG key into the client module
135136
echo "$SECRING_GPG" | base64 --decode > ./secring.gpg
136-
ls -ltr
137+
138+
# Copy the key ring file into the jedis-compatibility module which also performs signing
139+
if [ -d ../jedis-compatibility ]; then
140+
cp ./secring.gpg ../jedis-compatibility/secring.gpg
141+
else
142+
echo "jedis-compatibility module directory not found" >&2
143+
exit 1
144+
fi
145+
146+
echo "Listing key ring files to verify presence:"
147+
ls -l ./secring.gpg ../jedis-compatibility/secring.gpg
137148
env:
138149
SECRING_GPG: ${{ secrets.SECRING_GPG }}
139150

0 commit comments

Comments
 (0)