diff --git a/action.yml b/action.yml index 28e9108..11b9dda 100644 --- a/action.yml +++ b/action.yml @@ -109,25 +109,19 @@ runs: exit 1 fi - json_get() { # file key + json_get() { if [ "$JSON" = "json_jq" ]; then jq -r --arg k "$2" '.[$k] // ""' "$1" else - python3 - "$1" "$2" <<'PYEOF' - import json, sys - print(json.load(open(sys.argv[1])).get(sys.argv[2], "")) - PYEOF + python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get(sys.argv[2],""))' "$1" "$2" fi } - urlenc() { # string + urlenc() { if [ "$JSON" = "json_jq" ]; then jq -nr --arg v "$1" '$v | @uri' else - python3 - "$1" <<'PYEOF' - import sys, urllib.parse - print(urllib.parse.quote(sys.argv[1], safe="")) - PYEOF + python3 -c 'import sys,urllib.parse;print(urllib.parse.quote(sys.argv[1],safe=""))' "$1" fi } @@ -139,7 +133,6 @@ runs: REL_BODY="$(cat "$INPUT_BODY_PATH")" fi - # Minimal tag encoding for the lookup path (covers owner/name style tags). TAG_ENC="${TAG//\//%2F}" echo "Checking for existing release '$TAG' in $REPO ..." @@ -164,19 +157,9 @@ runs: if [ -z "${REL_ID:-}" ]; then echo "Creating release '$TAG' ..." if [ "$JSON" = "json_jq" ]; then - PAYLOAD="$(jq -n --arg tag "$TAG" --arg name "$REL_NAME" --arg body "$REL_BODY" \ - --argjson draft "$INPUT_DRAFT" --argjson pre "$INPUT_PRERELEASE" --arg target "$INPUT_TARGET_COMMITISH" \ - '{tag_name:$tag,name:$name,body:$body,draft:$draft,prerelease:$pre} + (if $target == "" then {} else {target_commitish:$target} end)')" + PAYLOAD="$(jq -n --arg tag "$TAG" --arg name "$REL_NAME" --arg body "$REL_BODY" --argjson draft "$INPUT_DRAFT" --argjson pre "$INPUT_PRERELEASE" --arg target "$INPUT_TARGET_COMMITISH" '{tag_name:$tag,name:$name,body:$body,draft:$draft,prerelease:$pre} + (if $target == "" then {} else {target_commitish:$target} end)')" else - PAYLOAD="$(TAG="$TAG" REL_NAME="$REL_NAME" REL_BODY="$REL_BODY" INPUT_DRAFT="$INPUT_DRAFT" INPUT_PRERELEASE="$INPUT_PRERELEASE" INPUT_TARGET_COMMITISH="$INPUT_TARGET_COMMITISH" python3 <<'PYEOF' - import json, os - p = {"tag_name": os.environ["TAG"], "name": os.environ["REL_NAME"], "body": os.environ["REL_BODY"], - "draft": os.environ["INPUT_DRAFT"] == "true", "prerelease": os.environ["INPUT_PRERELEASE"] == "true"} - if os.environ["INPUT_TARGET_COMMITISH"]: - p["target_commitish"] = os.environ["INPUT_TARGET_COMMITISH"] - print(json.dumps(p)) - PYEOF - )" + PAYLOAD="$(python3 -c 'import json,sys;tag,nam,bod,dr,pre,tgt=sys.argv[1:7];p={"tag_name":tag,"name":nam,"body":bod,"draft":dr=="true","prerelease":pre=="true"};p.update({"target_commitish":tgt} if tgt else {});print(json.dumps(p))' "$TAG" "$REL_NAME" "$REL_BODY" "$INPUT_DRAFT" "$INPUT_PRERELEASE" "$INPUT_TARGET_COMMITISH")" fi HTTP_CODE=$(curl -sS -o /tmp/pr_created.json -w '%{http_code}' -X POST -H "$AUTH_HEADER" -H 'Content-Type: application/json' -d "$PAYLOAD" "$API/repos/$REPO/releases") if [ "$HTTP_CODE" != "201" ]; then