Compare commits
1 Commits
fix/t_a292
...
46cc91ccbe
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46cc91ccbe |
@@ -653,9 +653,3 @@ Independent security review surfaced three high-impact and four medium findings;
|
|||||||
2. After merge, kickoff M3-01 (DTOs) on `feat/federation-m3-types` with sonnet subagent in worktree
|
2. After merge, kickoff M3-01 (DTOs) on `feat/federation-m3-types` with sonnet subagent in worktree
|
||||||
3. Once M3-01 lands, fan out: M3-02 (harness) || M3-03 (AuthGuard) → M3-04 (ScopeService) || M3-08 (FederationClient)
|
3. Once M3-01 lands, fan out: M3-02 (harness) || M3-03 (AuthGuard) → M3-04 (ScopeService) || M3-08 (FederationClient)
|
||||||
4. Re-converge at M3-10 (Integration) → M3-11 (E2E)
|
4. Re-converge at M3-10 (Integration) → M3-11 (E2E)
|
||||||
|
|
||||||
### Session 24 — 2026-05-22 — Gitea PR metadata wrapper hardening
|
|
||||||
|
|
||||||
- Fixed `packages/mosaic/framework/tools/git/pr-metadata.sh` Gitea path to fail closed on non-2xx API responses instead of normalizing API error JSON into null/empty PR metadata.
|
|
||||||
- Added token fallback behavior: try explicit `GITEA_TOKEN`, Mosaic credential-loader token, then matching `~/.git-credentials` HTTPS token; this handles stale host-scoped credential-loader entries while preserving existing credential sources.
|
|
||||||
- Confirmed real U-Connect Gitea PRs #1905 and #1908 now return `number`, `headRefName`, `baseRefName`, `state`, `author`, `url`, and `mergeable` correctly, restoring `pr-merge.sh` base branch detection.
|
|
||||||
|
|||||||
@@ -74,6 +74,16 @@ get_repo_name() {
|
|||||||
echo "${repo_info##*/}"
|
echo "${repo_info##*/}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get_repo_slug() {
|
||||||
|
get_repo_info
|
||||||
|
}
|
||||||
|
|
||||||
|
get_gitea_repo_args() {
|
||||||
|
local repo
|
||||||
|
repo=$(get_repo_slug) || return 1
|
||||||
|
printf -- '--repo %q --login %q' "$repo" "${GITEA_LOGIN:-mosaicstack}"
|
||||||
|
}
|
||||||
|
|
||||||
get_remote_host() {
|
get_remote_host() {
|
||||||
local remote_url
|
local remote_url
|
||||||
remote_url=$(git remote get-url origin 2>/dev/null || true)
|
remote_url=$(git remote get-url origin 2>/dev/null || true)
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
||||||
echo "Added comment to GitHub issue #$ISSUE_NUMBER"
|
echo "Added comment to GitHub issue #$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
tea issue comment "$ISSUE_NUMBER" "$COMMENT"
|
tea issue comment "$ISSUE_NUMBER" "$COMMENT" $(get_gitea_repo_args)
|
||||||
echo "Added comment to Gitea issue #$ISSUE_NUMBER"
|
echo "Added comment to Gitea issue #$ISSUE_NUMBER"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -112,20 +112,22 @@ PLATFORM=$(detect_platform)
|
|||||||
|
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
github)
|
github)
|
||||||
CMD="gh issue create --title \"$TITLE\""
|
CMD=(gh issue create --title "$TITLE")
|
||||||
[[ -n "$BODY" ]] && CMD="$CMD --body \"$BODY\""
|
[[ -n "$BODY" ]] && CMD+=(--body "$BODY")
|
||||||
[[ -n "$LABELS" ]] && CMD="$CMD --label \"$LABELS\""
|
[[ -n "$LABELS" ]] && CMD+=(--label "$LABELS")
|
||||||
[[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
|
[[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
|
||||||
eval "$CMD"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
if command -v tea >/dev/null 2>&1; then
|
if command -v tea >/dev/null 2>&1; then
|
||||||
CMD="tea issue create --title \"$TITLE\""
|
REPO_SLUG=$(get_repo_slug)
|
||||||
[[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
|
REPO_ARGS=(--repo "$REPO_SLUG" --login "${GITEA_LOGIN:-mosaicstack}")
|
||||||
[[ -n "$LABELS" ]] && CMD="$CMD --labels \"$LABELS\""
|
CMD=(tea issue create "${REPO_ARGS[@]}" --title "$TITLE")
|
||||||
|
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
||||||
|
[[ -n "$LABELS" ]] && CMD+=(--labels "$LABELS")
|
||||||
# tea accepts milestone by name directly (verified 2026-02-05)
|
# tea accepts milestone by name directly (verified 2026-02-05)
|
||||||
[[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
|
[[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
|
||||||
if eval "$CMD"; then
|
if "${CMD[@]}"; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
echo "Warning: tea issue create failed, trying Gitea API fallback..." >&2
|
echo "Warning: tea issue create failed, trying Gitea API fallback..." >&2
|
||||||
|
|||||||
@@ -80,7 +80,8 @@ case "$PLATFORM" in
|
|||||||
eval "$CMD"
|
eval "$CMD"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
CMD="tea issues list --state $STATE --limit $LIMIT"
|
REPO_ARGS=$(get_gitea_repo_args)
|
||||||
|
CMD="tea issues list $REPO_ARGS --state $STATE --limit $LIMIT"
|
||||||
[[ -n "$LABEL" ]] && CMD="$CMD --labels \"$LABEL\""
|
[[ -n "$LABEL" ]] && CMD="$CMD --labels \"$LABEL\""
|
||||||
[[ -n "$MILESTONE" ]] && CMD="$CMD --milestones \"$MILESTONE\""
|
[[ -n "$MILESTONE" ]] && CMD="$CMD --milestones \"$MILESTONE\""
|
||||||
# Note: tea may not support assignee filter directly
|
# Note: tea may not support assignee filter directly
|
||||||
|
|||||||
@@ -52,9 +52,9 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
echo "Reopened GitHub issue #$ISSUE_NUMBER"
|
echo "Reopened GitHub issue #$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
tea issue comment "$ISSUE_NUMBER" "$COMMENT"
|
tea issue comment "$ISSUE_NUMBER" "$COMMENT" $(get_gitea_repo_args)
|
||||||
fi
|
fi
|
||||||
tea issue reopen "$ISSUE_NUMBER"
|
tea issue reopen "$ISSUE_NUMBER" $(get_gitea_repo_args)
|
||||||
echo "Reopened Gitea issue #$ISSUE_NUMBER"
|
echo "Reopened Gitea issue #$ISSUE_NUMBER"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
gh issue view "$ISSUE_NUMBER"
|
gh issue view "$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
if command -v tea >/dev/null 2>&1; then
|
if command -v tea >/dev/null 2>&1; then
|
||||||
if tea issue "$ISSUE_NUMBER"; then
|
if tea issue "$ISSUE_NUMBER" $(get_gitea_repo_args); then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
echo "Warning: tea issue view failed, trying Gitea API fallback..." >&2
|
echo "Warning: tea issue view failed, trying Gitea API fallback..." >&2
|
||||||
|
|||||||
@@ -52,9 +52,9 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
echo "Closed GitHub PR #$PR_NUMBER"
|
echo "Closed GitHub PR #$PR_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
tea pr comment "$PR_NUMBER" "$COMMENT"
|
tea pr comment "$PR_NUMBER" "$COMMENT" $(get_gitea_repo_args)
|
||||||
fi
|
fi
|
||||||
tea pr close "$PR_NUMBER"
|
tea pr close "$PR_NUMBER" $(get_gitea_repo_args)
|
||||||
echo "Closed Gitea PR #$PR_NUMBER"
|
echo "Closed Gitea PR #$PR_NUMBER"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -17,6 +17,51 @@ MILESTONE=""
|
|||||||
DRAFT=false
|
DRAFT=false
|
||||||
ISSUE=""
|
ISSUE=""
|
||||||
|
|
||||||
|
# get_remote_host, get_gitea_token, get_repo_info, and get_gitea_repo_args are provided by detect-platform.sh
|
||||||
|
|
||||||
|
gitea_pr_create_api() {
|
||||||
|
local host repo token url payload
|
||||||
|
host=$(get_remote_host) || {
|
||||||
|
echo "Error: could not determine remote host for API fallback" >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
repo=$(get_repo_info) || {
|
||||||
|
echo "Error: could not determine repo owner/name for API fallback" >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
token=$(get_gitea_token "$host") || {
|
||||||
|
echo "Error: Gitea token not found for API fallback (set GITEA_TOKEN or configure ~/.git-credentials)" >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ -n "$LABELS" || -n "$MILESTONE" || "$DRAFT" == true ]]; then
|
||||||
|
echo "Warning: API fallback applies title/body/head/base only; labels/milestone/draft require authenticated tea setup." >&2
|
||||||
|
fi
|
||||||
|
|
||||||
|
payload=$(TITLE="$TITLE" BODY="$BODY" HEAD_BRANCH="$HEAD_BRANCH" BASE_BRANCH="$BASE_BRANCH" python3 - <<'PY'
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
payload = {
|
||||||
|
"title": os.environ["TITLE"],
|
||||||
|
"head": os.environ["HEAD_BRANCH"],
|
||||||
|
"base": os.environ["BASE_BRANCH"] or "main",
|
||||||
|
}
|
||||||
|
body = os.environ.get("BODY", "")
|
||||||
|
if body:
|
||||||
|
payload["body"] = body
|
||||||
|
print(json.dumps(payload))
|
||||||
|
PY
|
||||||
|
)
|
||||||
|
|
||||||
|
url="https://${host}/api/v1/repos/${repo}/pulls"
|
||||||
|
curl -fsS -X POST \
|
||||||
|
-H "Authorization: token ${token}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$payload" \
|
||||||
|
"$url"
|
||||||
|
}
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Usage: $(basename "$0") [OPTIONS]
|
Usage: $(basename "$0") [OPTIONS]
|
||||||
@@ -118,33 +163,37 @@ PLATFORM=$(detect_platform)
|
|||||||
|
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
github)
|
github)
|
||||||
CMD="gh pr create --title \"$TITLE\""
|
CMD=(gh pr create --title "$TITLE")
|
||||||
[[ -n "$BODY" ]] && CMD="$CMD --body \"$BODY\""
|
[[ -n "$BODY" ]] && CMD+=(--body "$BODY")
|
||||||
[[ -n "$BASE_BRANCH" ]] && CMD="$CMD --base \"$BASE_BRANCH\""
|
[[ -n "$BASE_BRANCH" ]] && CMD+=(--base "$BASE_BRANCH")
|
||||||
[[ -n "$HEAD_BRANCH" ]] && CMD="$CMD --head \"$HEAD_BRANCH\""
|
[[ -n "$HEAD_BRANCH" ]] && CMD+=(--head "$HEAD_BRANCH")
|
||||||
[[ -n "$LABELS" ]] && CMD="$CMD --label \"$LABELS\""
|
[[ -n "$LABELS" ]] && CMD+=(--label "$LABELS")
|
||||||
[[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
|
[[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
|
||||||
[[ "$DRAFT" == true ]] && CMD="$CMD --draft"
|
[[ "$DRAFT" == true ]] && CMD+=(--draft)
|
||||||
eval "$CMD"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
# tea pull create syntax
|
# tea pull create syntax. Always pass --repo because tea repo inference
|
||||||
CMD="tea pr create --title \"$TITLE\""
|
# is unreliable in Mosaic worktrees/profile shells. Use arrays instead
|
||||||
[[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
|
# of eval so markdown backticks/body content are not shell-executed.
|
||||||
[[ -n "$BASE_BRANCH" ]] && CMD="$CMD --base \"$BASE_BRANCH\""
|
REPO_SLUG=$(get_repo_slug)
|
||||||
[[ -n "$HEAD_BRANCH" ]] && CMD="$CMD --head \"$HEAD_BRANCH\""
|
REPO_ARGS=(--repo "$REPO_SLUG" --login "${GITEA_LOGIN:-mosaicstack}")
|
||||||
|
CMD=(tea pr create "${REPO_ARGS[@]}" --title "$TITLE")
|
||||||
|
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
||||||
|
[[ -n "$BASE_BRANCH" ]] && CMD+=(--base "$BASE_BRANCH")
|
||||||
|
[[ -n "$HEAD_BRANCH" ]] && CMD+=(--head "$HEAD_BRANCH")
|
||||||
|
|
||||||
# Handle labels for tea
|
# Handle labels for tea
|
||||||
if [[ -n "$LABELS" ]]; then
|
if [[ -n "$LABELS" ]]; then
|
||||||
# tea may use --labels flag
|
# tea may use --labels flag
|
||||||
CMD="$CMD --labels \"$LABELS\""
|
CMD+=(--labels "$LABELS")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Handle milestone for tea
|
# Handle milestone for tea
|
||||||
if [[ -n "$MILESTONE" ]]; then
|
if [[ -n "$MILESTONE" ]]; then
|
||||||
MILESTONE_ID=$(tea milestones list 2>/dev/null | grep -E "^\s*[0-9]+" | grep "$MILESTONE" | awk '{print $1}' | head -1)
|
MILESTONE_ID=$(tea milestones list "${REPO_ARGS[@]}" 2>/dev/null | grep -E "^\s*[0-9]+" | grep "$MILESTONE" | awk '{print $1}' | head -1)
|
||||||
if [[ -n "$MILESTONE_ID" ]]; then
|
if [[ -n "$MILESTONE_ID" ]]; then
|
||||||
CMD="$CMD --milestone $MILESTONE_ID"
|
CMD+=(--milestone "$MILESTONE_ID")
|
||||||
else
|
else
|
||||||
echo "Warning: Could not find milestone '$MILESTONE', creating without milestone" >&2
|
echo "Warning: Could not find milestone '$MILESTONE', creating without milestone" >&2
|
||||||
fi
|
fi
|
||||||
@@ -155,7 +204,11 @@ case "$PLATFORM" in
|
|||||||
echo "Note: Draft PR may not be supported by your tea version" >&2
|
echo "Note: Draft PR may not be supported by your tea version" >&2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval "$CMD"
|
if "${CMD[@]}"; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "Warning: tea pr create failed, trying Gitea API fallback..." >&2
|
||||||
|
gitea_pr_create_api
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Error: Could not detect git platform" >&2
|
echo "Error: Could not detect git platform" >&2
|
||||||
|
|||||||
@@ -74,7 +74,8 @@ case "$PLATFORM" in
|
|||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
# tea pr list - note: tea uses 'pulls' subcommand in some versions
|
# tea pr list - note: tea uses 'pulls' subcommand in some versions
|
||||||
CMD="tea pr list --state $STATE --limit $LIMIT"
|
REPO_ARGS=$(get_gitea_repo_args)
|
||||||
|
CMD="tea pr list $REPO_ARGS --state $STATE --limit $LIMIT"
|
||||||
|
|
||||||
# tea filtering may be limited
|
# tea filtering may be limited
|
||||||
if [[ -n "$LABEL" ]]; then
|
if [[ -n "$LABEL" ]]; then
|
||||||
|
|||||||
@@ -69,81 +69,32 @@ elif [[ "$PLATFORM" == "gitea" ]]; then
|
|||||||
|
|
||||||
API_URL="https://${HOST}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}"
|
API_URL="https://${HOST}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}"
|
||||||
|
|
||||||
declare -a TOKEN_CANDIDATES=()
|
GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
|
||||||
add_token_candidate() {
|
|
||||||
local candidate="$1"
|
|
||||||
[[ -z "$candidate" ]] && return 0
|
|
||||||
local existing
|
|
||||||
for existing in "${TOKEN_CANDIDATES[@]:-}"; do
|
|
||||||
[[ "$existing" == "$candidate" ]] && return 0
|
|
||||||
done
|
|
||||||
TOKEN_CANDIDATES+=("$candidate")
|
|
||||||
}
|
|
||||||
|
|
||||||
add_token_candidate "${GITEA_TOKEN:-}"
|
if [[ -n "$GITEA_API_TOKEN" ]]; then
|
||||||
add_token_candidate "$(get_gitea_token "$HOST" || true)"
|
RAW=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" "$API_URL")
|
||||||
|
else
|
||||||
# Git HTTPS credentials often contain a valid Gitea API token even when a
|
RAW=$(curl -sS "$API_URL")
|
||||||
# Mosaic credential-source entry is stale. Try them as a fallback before
|
|
||||||
# falling back to an unauthenticated request.
|
|
||||||
CREDS_FILE="$HOME/.git-credentials"
|
|
||||||
if [[ -f "$CREDS_FILE" ]]; then
|
|
||||||
while IFS= read -r credential_token; do
|
|
||||||
add_token_candidate "$credential_token"
|
|
||||||
done < <(grep -F "$HOST" "$CREDS_FILE" 2>/dev/null | sed -n 's#https\?://[^@]*:\([^@/]*\)@.*#\1#p')
|
|
||||||
fi
|
|
||||||
|
|
||||||
RAW=""
|
|
||||||
HTTP_STATUS=""
|
|
||||||
if [[ ${#TOKEN_CANDIDATES[@]} -gt 0 ]]; then
|
|
||||||
for GITEA_API_TOKEN in "${TOKEN_CANDIDATES[@]}"; do
|
|
||||||
RESPONSE_FILE=$(mktemp)
|
|
||||||
HTTP_STATUS=$(curl -sS -o "$RESPONSE_FILE" -w '%{http_code}' -H "Authorization: token $GITEA_API_TOKEN" "$API_URL" || true)
|
|
||||||
RAW=$(cat "$RESPONSE_FILE")
|
|
||||||
rm -f "$RESPONSE_FILE"
|
|
||||||
[[ "$HTTP_STATUS" =~ ^2 ]] && break
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! "$HTTP_STATUS" =~ ^2 ]]; then
|
|
||||||
RESPONSE_FILE=$(mktemp)
|
|
||||||
HTTP_STATUS=$(curl -sS -o "$RESPONSE_FILE" -w '%{http_code}' "$API_URL" || true)
|
|
||||||
RAW=$(cat "$RESPONSE_FILE")
|
|
||||||
rm -f "$RESPONSE_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! "$HTTP_STATUS" =~ ^2 ]]; then
|
|
||||||
ERROR_MESSAGE=$(printf '%s' "$RAW" | python3 -c 'import json, sys
|
|
||||||
try:
|
|
||||||
data=json.load(sys.stdin)
|
|
||||||
except Exception:
|
|
||||||
data={}
|
|
||||||
print(data.get("message") or data.get("error") or "unknown error")')
|
|
||||||
echo "Error: failed to fetch Gitea PR #$PR_NUMBER from $HOST/$OWNER/$REPO (HTTP $HTTP_STATUS): $ERROR_MESSAGE" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Normalize Gitea response to match our expected schema
|
# Normalize Gitea response to match our expected schema
|
||||||
METADATA=$(echo "$RAW" | python3 -c "
|
METADATA=$(echo "$RAW" | python3 -c "
|
||||||
import json, sys
|
import json, sys
|
||||||
data = json.load(sys.stdin)
|
data = json.load(sys.stdin)
|
||||||
head = data.get('head') or {}
|
|
||||||
base = data.get('base') or {}
|
|
||||||
user = data.get('user') or {}
|
|
||||||
normalized = {
|
normalized = {
|
||||||
'number': data.get('number') or data.get('index'),
|
'number': data.get('number'),
|
||||||
'title': data.get('title'),
|
'title': data.get('title'),
|
||||||
'body': data.get('body', ''),
|
'body': data.get('body', ''),
|
||||||
'state': data.get('state'),
|
'state': data.get('state'),
|
||||||
'author': user.get('login', ''),
|
'author': data.get('user', {}).get('login', ''),
|
||||||
'headRefName': head.get('ref') or head.get('label', '').split(':')[-1],
|
'headRefName': data.get('head', {}).get('ref', ''),
|
||||||
'baseRefName': base.get('ref') or base.get('label', '').split(':')[-1],
|
'baseRefName': data.get('base', {}).get('ref', ''),
|
||||||
'labels': [l.get('name', '') for l in data.get('labels', [])],
|
'labels': [l.get('name', '') for l in data.get('labels', [])],
|
||||||
'assignees': [a.get('login', '') for a in data.get('assignees', [])],
|
'assignees': [a.get('login', '') for a in data.get('assignees', [])],
|
||||||
'milestone': data.get('milestone', {}).get('title', '') if data.get('milestone') else '',
|
'milestone': data.get('milestone', {}).get('title', '') if data.get('milestone') else '',
|
||||||
'createdAt': data.get('created_at', ''),
|
'createdAt': data.get('created_at', ''),
|
||||||
'updatedAt': data.get('updated_at', ''),
|
'updatedAt': data.get('updated_at', ''),
|
||||||
'url': data.get('html_url') or data.get('url', ''),
|
'url': data.get('html_url', ''),
|
||||||
'isDraft': data.get('draft', False),
|
'isDraft': data.get('draft', False),
|
||||||
'mergeable': data.get('mergeable'),
|
'mergeable': data.get('mergeable'),
|
||||||
'diffUrl': data.get('diff_url', ''),
|
'diffUrl': data.get('diff_url', ''),
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
case $ACTION in
|
case $ACTION in
|
||||||
approve)
|
approve)
|
||||||
tea pr approve "$PR_NUMBER" ${COMMENT:+--comment "$COMMENT"}
|
tea pr approve "$PR_NUMBER" $(get_gitea_repo_args) ${COMMENT:+--comment "$COMMENT"}
|
||||||
echo "Approved Gitea PR #$PR_NUMBER"
|
echo "Approved Gitea PR #$PR_NUMBER"
|
||||||
;;
|
;;
|
||||||
request-changes)
|
request-changes)
|
||||||
@@ -93,7 +93,7 @@ elif [[ "$PLATFORM" == "gitea" ]]; then
|
|||||||
echo "Error: Comment required for request-changes"
|
echo "Error: Comment required for request-changes"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
tea pr reject "$PR_NUMBER" --comment "$COMMENT"
|
tea pr reject "$PR_NUMBER" $(get_gitea_repo_args) --comment "$COMMENT"
|
||||||
echo "Requested changes on Gitea PR #$PR_NUMBER"
|
echo "Requested changes on Gitea PR #$PR_NUMBER"
|
||||||
;;
|
;;
|
||||||
comment)
|
comment)
|
||||||
@@ -101,7 +101,7 @@ elif [[ "$PLATFORM" == "gitea" ]]; then
|
|||||||
echo "Error: Comment required"
|
echo "Error: Comment required"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
tea pr comment "$PR_NUMBER" "$COMMENT"
|
tea pr comment "$PR_NUMBER" "$COMMENT" $(get_gitea_repo_args)
|
||||||
echo "Added comment to Gitea PR #$PR_NUMBER"
|
echo "Added comment to Gitea PR #$PR_NUMBER"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ detect_platform
|
|||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh pr view "$PR_NUMBER"
|
gh pr view "$PR_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
tea pr "$PR_NUMBER"
|
tea pr "$PR_NUMBER" $(get_gitea_repo_args)
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
Reference in New Issue
Block a user