From a957401a5984b00a5a516f059bfe7afed0c10ec7 Mon Sep 17 00:00:00 2001 From: Jaybe Date: Fri, 14 Nov 2025 22:05:38 +0900 Subject: [PATCH] test --- .gitea/workflows/ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index a23b789..9e6d35e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -60,13 +60,23 @@ jobs: LABELS_JSON=$(curl -sS -X GET \ -H "Authorization: token ${CI_TOKEN}" \ "${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/issues/${PR_NUMBER}") + echo "labels payload (first 200 chars):"; echo "$LABELS_JSON" | cut -c1-200 || true if ! echo "$LABELS_JSON" | grep -qi '"name":"automerge"'; then echo "Label 'automerge' not present; skipping merge"; exit 0; fi echo "Label 'automerge' present; proceeding to merge" + # ensure PR is open + PR_JSON=$(curl -sS -X GET \ + -H "Authorization: token ${CI_TOKEN}" \ + "${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/pulls/${PR_NUMBER}") + STATE=$(echo "$PR_JSON" | sed -n 's/.*"state":"\([^"]*\)".*/\1/p') + echo "PR state: ${STATE:-unknown}" + if [ "${STATE:-}" != "open" ]; then + echo "PR state is not open; skipping merge"; exit 0; fi echo "Merging PR #$PR_NUMBER for $OWNER/$NAME" - RESP=$(curl -sS -X POST \ + HTTP_CODE=$(curl -sS -o /tmp/merge_resp.json -w "%{http_code}" -X POST \ -H "Content-Type: application/json" \ -H "Authorization: token ${CI_TOKEN}" \ "${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/pulls/${PR_NUMBER}/merge" \ -d '{"Do":"merge","MergeMessage":"auto-merge: CI green"}' || true) - echo "API response: $RESP" + echo "merge http: $HTTP_CODE" + echo "merge resp:"; cat /tmp/merge_resp.json || true