feat: refactor and error handling

This commit is contained in:
Michael Kriese 2026-02-17 22:29:32 +01:00
parent 47f2d7a74e
commit f818df06f9
No known key found for this signature in database
GPG key ID: F8D7748549A5986A
2 changed files with 32 additions and 30 deletions

View file

@ -27,7 +27,7 @@ export GNUPGHOME
get_tag() {
if ! test -f "$TAG_FILE"; then
if api GET repos/$REPO/tags/"$TAG_URL" >"$TAG_FILE"; then
if api_json GET repos/$REPO/tags/"$TAG_URL" >"$TAG_FILE"; then
echo "tag $TAG exists"
else
echo "tag $TAG does not exists"
@ -58,12 +58,12 @@ ensure_tag() {
}
create_tag() {
api POST repos/$REPO/tags --data-raw '{"tag_name": "'"$TAG"'", "target": "'"$SHA"'"}' >"$TAG_FILE"
api_json POST repos/$REPO/tags --data-raw '{"tag_name": "'"$TAG"'", "target": "'"$SHA"'"}' >"$TAG_FILE"
}
delete_tag() {
if get_tag; then
api DELETE repos/$REPO/tags/"$TAG_URL"
api_json DELETE repos/$REPO/tags/"$TAG_URL"
rm -f "$TAG_FILE"
fi
}
@ -78,15 +78,16 @@ upload_release() {
fi
ensure_tag
jq -n --arg title "$TITLE" --arg body "$RELEASENOTES" --arg tag "$TAG" --arg pre $prerelease '{"draft": true, "name": $title, "body": $body, "prerelease": $pre | test("true"), "tag_name": $tag }' >"$TMP_DIR"/release-payload.json
if ! api POST repos/$REPO/releases -d @"$TMP_DIR"/release-payload.json >"$TMP_DIR"/release.json; then
echo "-----------------------------"
if ${VERBOSE:-false}; then
echo "Payload:"
cat "$TMP_DIR"/release-payload.json
echo "-----------------------------"
echo "Response:"
cat "$TMP_DIR"/release.json
echo "-----------------------------"
exit 22
cat "$TMP_DIR"/release-payload.json | jq
fi
if ! api_json POST repos/$REPO/releases -d @"$TMP_DIR"/release-payload.json >"$TMP_DIR"/release.json; then
if ${VERBOSE:-false}; then
echo "Response:"
cat "$TMP_DIR"/release.json | jq
fi
exit 1
fi
if [ "$SKIP_ASSETS" == 'false' ]; then
release_id=$(jq --raw-output .id <"$TMP_DIR"/release.json)
@ -95,7 +96,13 @@ upload_release() {
# https://unix.stackexchange.com/questions/94295/shellcheck-is-advising-not-to-use-basename-why/94307#94307
# url encode some chars
asset_name="$(echo -n "${file##*/}" | jq -sRr @uri)"
api_bin POST "repos/$REPO/releases/$release_id/assets?name=$asset_name" -H "Content-Type: multipart/form-data" -F "attachment=@$file"
if ! api POST "repos/$REPO/releases/$release_id/assets?name=$asset_name" -H "Content-Type: multipart/form-data" -F "attachment=@$file" >"$TMP_DIR/release-$asset_name.json"; then
if ${VERBOSE:-false}; then
echo "Response:"
cat "$TMP_DIR/release-$asset_name.json" | jq
fi
exit 1
fi
done
fi
maybe_use_release_note_assistant
@ -105,9 +112,9 @@ upload_release() {
release_draft() {
local state="$1"
local id=$(api GET repos/$REPO/releases/tags/"$TAG_URL" | jq --raw-output .id)
local id=$(api_json GET repos/$REPO/releases/tags/"$TAG_URL" | jq --raw-output .id)
api PATCH repos/$REPO/releases/"$id" --data-raw '{"draft": '"$state"', "hide_archive_links": '$HIDE_ARCHIVE_LINK'}'
api_json PATCH repos/$REPO/releases/"$id" --data-raw '{"draft": '"$state"', "hide_archive_links": '$HIDE_ARCHIVE_LINK'}'
}
maybe_use_release_note_assistant() {
@ -143,7 +150,7 @@ maybe_override() {
if test "$OVERRIDE" = "false"; then
return
fi
api DELETE repos/$REPO/releases/tags/"$TAG_URL" >&/dev/null || true
api_json DELETE repos/$REPO/releases/tags/"$TAG_URL" >&/dev/null || true
if get_tag && ! matched_tag; then
delete_tag
fi
@ -163,16 +170,11 @@ setup_api() {
fi
}
api() {
method=$1
shift
path=$1
shift
curl --retry 5 --fail -X "$method" -sS -H "Content-Type: application/json" -H "Authorization: token $TOKEN" "$@" $FORGEJO/api/v1/"$path"
api_json() {
api -H "Content-Type: application/json" "$@"
}
api_bin() {
api() {
method=$1
shift
path=$1
@ -184,7 +186,7 @@ api_bin() {
wait_release() {
local ready=false
for i in $(seq $RETRY); do
if api GET repos/$REPO/releases/tags/"$TAG_URL" | jq --raw-output .draft >"$TMP_DIR"/draft; then
if api_json GET repos/$REPO/releases/tags/"$TAG_URL" | jq --raw-output .draft >"$TMP_DIR"/draft; then
if test "$(cat "$TMP_DIR"/draft)" = "false"; then
ready=true
break
@ -209,11 +211,11 @@ download() {
cd $RELEASE_DIR
if [[ ${DOWNLOAD_LATEST} = "true" ]]; then
echo "Downloading the latest release"
api GET repos/$REPO/releases/latest >"$TMP_DIR"/assets.json
api_json GET repos/$REPO/releases/latest >"$TMP_DIR"/assets.json
elif [[ ${DOWNLOAD_LATEST} == "false" ]]; then
wait_release
echo "Downloading tagged release ${TAG}"
api GET repos/$REPO/releases/tags/"$TAG_URL" >"$TMP_DIR"/assets.json
api_json GET repos/$REPO/releases/tags/"$TAG_URL" >"$TMP_DIR"/assets.json
fi
jq --raw-output '.assets[] | "\(.browser_download_url) \(.name)"' <"$TMP_DIR"/assets.json | while read url name; do # `name` may contain whitespace, therefore, it must be last
url=$(echo "$url" | sed "s#/download/${TAG}/#/download/${TAG_URL}/#")

View file

@ -6,15 +6,15 @@ PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}: '
test_teardown() {
setup_api
api DELETE repos/$REPO/releases/tags/$TAG || true
api DELETE repos/$REPO/tags/$TAG || true
api_json DELETE repos/$REPO/releases/tags/$TAG || true
api_json DELETE repos/$REPO/tags/$TAG || true
rm -fr dist/release
}
test_reset_repo() {
local project="$1"
api DELETE repos/$REPO || true
api POST user/repos --data-raw '{"name":"'$project'", "auto_init":true}'
api_json DELETE repos/$REPO || true
api_json POST user/repos --data-raw '{"name":"'$project'", "auto_init":true}'
git clone $FORGEJO/$REPO $TMP_DIR/repo
SHA=$(git -C $TMP_DIR/repo rev-parse HEAD)
}