Skip to content

Commit 3a7817d

Browse files
committed
Fix minisign and gpg
1 parent 1358cff commit 3a7817d

1 file changed

Lines changed: 17 additions & 1 deletion

File tree

.github/workflows/release.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,13 @@ jobs:
209209
echo "No GPG secret key imported." >&2
210210
exit 1
211211
fi
212+
if [ -z "${GPG_PASSPHRASE:-}" ]; then
213+
if ! gpg --batch --yes --local-user "$key_id" --armor --detach-sign -o /tmp/gpg-passcheck.asc /dev/null >/dev/null 2>&1; then
214+
echo "GPG_PASSPHRASE is required for the provided GPG key." >&2
215+
exit 1
216+
fi
217+
rm -f /tmp/gpg-passcheck.asc
218+
fi
212219
213220
mapfile -d '' files < <(find dist -name 'bugleos-toolchain-*.tar.gz' -print0 | sort -z)
214221
if [ "${#files[@]}" -eq 0 ]; then
@@ -224,10 +231,19 @@ jobs:
224231
225232
sha256sum "${files[@]}" "${sboms[@]}" > dist/SHA256SUMS
226233
227-
minisign_args=(-S -s out/minisign.key -p out/minisign.pub)
234+
minisign_args=(-S -s out/minisign.key)
228235
if [ -n "${MINISIGN_PASSWORD:-}" ]; then
229236
minisign_args+=(-P "$MINISIGN_PASSWORD")
230237
fi
238+
if [ -z "${MINISIGN_PASSWORD:-}" ]; then
239+
tmp_minisign="$(mktemp)"
240+
printf 'minisign-check' > "$tmp_minisign"
241+
if ! minisign -S -s out/minisign.key -m "$tmp_minisign" >/dev/null 2>&1; then
242+
echo "MINISIGN_PASSWORD is required for the provided minisign key." >&2
243+
exit 1
244+
fi
245+
rm -f "$tmp_minisign" "$tmp_minisign.minisig"
246+
fi
231247
232248
minisign "${minisign_args[@]}" -m dist/SHA256SUMS
233249
if [ -n "${GPG_PASSPHRASE:-}" ]; then

0 commit comments

Comments
 (0)