diff --git a/.gitea/workflows/android-release.yml b/.gitea/workflows/android-release.yml index 1bd4ade..cac5f63 100644 --- a/.gitea/workflows/android-release.yml +++ b/.gitea/workflows/android-release.yml @@ -191,7 +191,7 @@ jobs: exit 1 fi - if [[ "$GITHUB_REF" == refs/tags/android-app-v* ]]; then + if [[ "$GITHUB_REF" == refs/tags/v* ]]; then tag_name="${GITHUB_REF#refs/tags/}" else app_version="$(awk -F '[:+]' '/^version:/ {gsub(/[[:space:]]/, "", $2); print $2; exit}' pubspec.yaml)" @@ -199,7 +199,7 @@ jobs: echo "Unable to resolve app version from pubspec.yaml." exit 1 fi - tag_name="android-app-v${app_version}" + tag_name="v${app_version}" fi echo "tag_name=$tag_name" >> "$GITHUB_OUTPUT" @@ -249,7 +249,7 @@ jobs: releases_url="$GITEA_API_URL/repos/$GITEA_OWNER/$GITEA_REPO/releases" release_by_tag_url="$releases_url/tags/$TAG_NAME" - export RELEASE_TITLE="Android App APK ${TAG_NAME}" + export RELEASE_TITLE="${TAG_NAME}" export RELEASE_BODY="Android app installation package (APK) for ${TAG_NAME}." status="$(curl -sS -o release.json -w "%{http_code}" \ @@ -265,7 +265,7 @@ jobs: print(json.dumps({ "tag_name": tag, "target_commitish": os.environ.get("TARGET_COMMITISH", ""), - "name": f"Android App APK {tag}", + "name": os.environ["RELEASE_TITLE"], "body": f"Android app installation package (APK) for {tag}.", "draft": False, "prerelease": False, @@ -353,7 +353,7 @@ jobs: fi done < asset-ids-to-delete.txt - release_asset_name="gongyun-${TAG_NAME}.apk" + release_asset_name="app-release-${TAG_NAME}.apk" curl -sS -f \ -X POST \ -H "Authorization: token $GITEA_TOKEN" \