diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 9cb5817..46add65 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -79,30 +79,13 @@ jobs: ART=$(cat "$GITHUB_WORKSPACE/.artifact_name") BASE="${ALIST_URL%/}" LOGIN_RESP=$(curl -sS -X POST "$BASE/api/auth/login" -H "Content-Type: application/json" -d "{\"username\":\"$ALIST_USER\",\"password\":\"$ALIST_PASSWORD\"}") - export LOGIN_RESP - TOKEN=$(python3 - << 'PY' -import os, json -s=os.environ.get('LOGIN_RESP','') -try: - j=json.loads(s) - d=j.get('data') or {} - print(d.get('token') or d.get('auth') or d.get('Authorization') or '') -except Exception: - print('') -PY - ) - if [ -n "$TOKEN" ]; then - curl -sS -X POST "$BASE/api/fs/mkdir" -H "Authorization: $TOKEN" -H "Content-Type: application/json" -d "{\"path\":\"/ci\"}" >/dev/null 2>&1 || true - UPLOAD_STATUS=$(curl -sS -w "%{http_code}" -o /dev/null -X PUT "$BASE/api/fs/form" -H "Authorization: $TOKEN" -F "path=/ci" -F "file=@$GITHUB_WORKSPACE/$ART;type=application/x-tar") - if [ "$UPLOAD_STATUS" -ge 400 ]; then - UPLOAD_STATUS=$(curl -sS -w "%{http_code}" -o /dev/null -X PUT "$BASE/api/fs/form" -H "Authorization: Bearer $TOKEN" -F "path=/ci" -F "file=@$GITHUB_WORKSPACE/$ART;type=application/x-tar") - fi - else - UPLOAD_STATUS=999 - fi + TOKEN=$(echo "$LOGIN_RESP" | sed -n 's/.*"token":"\([^"]*\)".*/\1/p') + if [ -z "$TOKEN" ]; then TOKEN=$(echo "$LOGIN_RESP" | sed -n 's/.*"auth":"\([^"]*\)".*/\1/p'); fi + if [ -z "$TOKEN" ]; then exit 1; fi + curl -sS -X POST "$BASE/api/fs/mkdir" -H "Authorization: $TOKEN" -H "Content-Type: application/json" -d "{\"path\":\"/ci\"}" >/dev/null 2>&1 || true + UPLOAD_STATUS=$(curl -sS -w "%{http_code}" -o /dev/null -X PUT "$BASE/api/fs/form" -H "Authorization: $TOKEN" -F "path=/ci" -F "file=@$GITHUB_WORKSPACE/$ART;type=application/x-tar") if [ "$UPLOAD_STATUS" -ge 400 ]; then - curl -s -u "$ALIST_USER:$ALIST_PASSWORD" -X MKCOL "$BASE/dav/ci" || true - UPLOAD_STATUS=$(curl -sS -w "%{http_code}" -o /dev/null -u "$ALIST_USER:$ALIST_PASSWORD" -T "$GITHUB_WORKSPACE/$ART" "$BASE/dav/ci/$ART") + UPLOAD_STATUS=$(curl -sS -w "%{http_code}" -o /dev/null -X PUT "$BASE/api/fs/form" -H "Authorization: Bearer $TOKEN" -F "path=/ci" -F "file=@$GITHUB_WORKSPACE/$ART;type=application/x-tar") fi test "$UPLOAD_STATUS" -lt 400 - name: Create release with download link