fix(ci): derive gitea login from token and retry auth modes

This commit is contained in:
Tracewebstudio Dev 2026-04-30 20:13:35 +02:00
parent 8803e6fa21
commit e534f5a9c7

View file

@ -33,6 +33,12 @@ jobs:
fi
REPO_NAME="${{ github.event.repository.name }}"
BRANCH_NAME="${{ github.ref_name }}"
API_USER_JSON="$(curl -fsS -H "Authorization: token ${GITEA_TOKEN}" "https://${GITEA_HOST}/api/v1/user" || true)"
RESOLVED_GITEA_USER="$(printf '%s' "$API_USER_JSON" | jq -r '.login // empty')"
if [ -n "$RESOLVED_GITEA_USER" ]; then
echo "Resolved token user: $RESOLVED_GITEA_USER"
fi
CANDIDATE_OWNERS="${GITEA_OWNER:-} Admin ${{ github.repository_owner }}"
TARGET_FULL_NAME=""
TARGET_URL=""
@ -63,17 +69,29 @@ jobs:
exit 1
fi
for auth_url in \
"https://${GITEA_USERNAME}:${GITEA_TOKEN}@${GITEA_HOST}/${TARGET_FULL_NAME}.git" \
"https://${GITEA_TOKEN}@${GITEA_HOST}/${TARGET_FULL_NAME}.git" \
"https://oauth2:${GITEA_TOKEN}@${GITEA_HOST}/${TARGET_FULL_NAME}.git"; do
for auth_user in "$RESOLVED_GITEA_USER" "$GITEA_USERNAME" "oauth2"; do
[ -n "$auth_user" ] || continue
auth_url="https://${auth_user}:${GITEA_TOKEN}@${GITEA_HOST}/${TARGET_FULL_NAME}.git"
if git ls-remote "$auth_url" >/dev/null 2>&1; then
TARGET_URL="$auth_url"
echo "Using Gitea credential mode for ${TARGET_FULL_NAME}"
echo "Using Gitea credential mode for ${TARGET_FULL_NAME} as ${auth_user}"
break
fi
done
if [ -z "$TARGET_URL" ]; then
for auth_url in \
"https://${GITEA_USERNAME}:${GITEA_TOKEN}@${GITEA_HOST}/${TARGET_FULL_NAME}.git" \
"https://${GITEA_TOKEN}@${GITEA_HOST}/${TARGET_FULL_NAME}.git" \
"https://oauth2:${GITEA_TOKEN}@${GITEA_HOST}/${TARGET_FULL_NAME}.git"; do
if git ls-remote "$auth_url" >/dev/null 2>&1; then
TARGET_URL="$auth_url"
echo "Using Gitea credential mode for ${TARGET_FULL_NAME}"
break
fi
done
fi
if [ -z "$TARGET_URL" ]; then
echo "Resolved repo path but authentication to Gitea git remote failed"
exit 1
@ -81,7 +99,7 @@ jobs:
git remote add gitea "$TARGET_URL"
git fetch gitea main || true
git push gitea HEAD:main --force-with-lease=refs/heads/main
git fetch gitea "$BRANCH_NAME" || true
git push gitea "HEAD:${BRANCH_NAME}" --force-with-lease=refs/heads/"$BRANCH_NAME"
echo "Sync complete!"