From 5b4151310a25d01d0ec0d9582a931c506fceb57a Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Fri, 17 Apr 2026 05:15:38 -0500 Subject: [PATCH] Fix updates.xml + release workflow heredoc [skip ci] --- .github/workflows/release.yml | 43 ++++++++++++++++++++++------------- updates.xml | 29 +++++++++++------------ 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec83807..bd051f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -286,17 +286,20 @@ jobs: exit 0 fi + export PY_STABILITY="$STABILITY" PY_VERSION="$VERSION" PY_SHA256="$SHA256" \ + PY_ZIP_NAME="$ZIP_NAME" PY_TAG="$TAG" PY_DATE="$DATE" \ + PY_GITEA_ORG="$GITEA_ORG" PY_GITEA_REPO="$GITEA_REPO" python3 << 'PYEOF' - import re + import re, os - stability = "${STABILITY}" - version = "${VERSION}" - sha256 = "${SHA256}" - zip_name = "${ZIP_NAME}" - tag = "${TAG}" - date = "${DATE}" - gitea_org = "${GITEA_ORG}" - gitea_repo = "${GITEA_REPO}" + stability = os.environ["PY_STABILITY"] + version = os.environ["PY_VERSION"] + sha256 = os.environ["PY_SHA256"] + zip_name = os.environ["PY_ZIP_NAME"] + tag = os.environ["PY_TAG"] + date = os.environ["PY_DATE"] + gitea_org = os.environ["PY_GITEA_ORG"] + gitea_repo = os.environ["PY_GITEA_REPO"] # Map stability to the value in updates.xml tag_map = { @@ -340,13 +343,21 @@ jobs: block ) - # Update GitHub download URL (if present) - gh_url = f"https://github.com/mokoconsulting-tech/{gitea_repo}/releases/download/{tag}/{zip_name}" - block = re.sub( - r"(]*>)https://github\.com/[^<]*()", - rf"\g<1>{gh_url}\g<2>", - block - ) + # Update GitHub download URL only for RC and stable (others are Gitea-only) + if stability in ("rc", "stable"): + gh_url = f"https://github.com/mokoconsulting-tech/{gitea_repo}/releases/download/{tag}/{zip_name}" + block = re.sub( + r"(]*>)https://github\.com/[^<]*()", + rf"\g<1>{gh_url}\g<2>", + block + ) + else: + # Remove any GitHub download URL for dev/alpha/beta + block = re.sub( + r"\n\s*]*>https://github\.com/[^<]*", + "", + block + ) content = content.replace(original_block, block) diff --git a/updates.xml b/updates.xml index 9cc9c42..1439dec 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -14,13 +14,12 @@ template site 03.09.16 - 2026-04-16 + 2026-04-17 https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/tag/development https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/development/mokocassiopeia-03.09.16-dev.zip - https://github.com/mokoconsulting-tech/MokoCassiopeia/releases/download/development/mokocassiopeia-03.09.16-dev.zip - sha256:c73e1b5d2c68fca92ab622e119d68fa124b938a93faa05b77ad31b14b8228131 + sha256:2986f08b59617a18d489e0d9e6e49d329ceb8297ae4755b6697f3326c2a41fc4 development Moko Consulting https://mokoconsulting.tech @@ -35,12 +34,11 @@ mokocassiopeia template site - 03.09.15 + 03.09.16 2026-04-14 https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/tag/alpha - https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/alpha/mokocassiopeia-03.09.15-alpha.zip - https://github.com/mokoconsulting-tech/MokoCassiopeia/releases/download/alpha/mokocassiopeia-03.09.15-alpha.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/alpha/mokocassiopeia-03.09.16-alpha.zip c2660acdf7389244462485f7ab4c286e9f851366a148acc16739a184576f7932 alpha @@ -57,12 +55,11 @@ mokocassiopeia template site - 03.09.15 + 03.09.16 2026-04-14 https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/tag/beta - https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/beta/mokocassiopeia-03.09.15-beta.zip - https://github.com/mokoconsulting-tech/MokoCassiopeia/releases/download/beta/mokocassiopeia-03.09.15-beta.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/beta/mokocassiopeia-03.09.16-beta.zip 4cbe4fc379182ef17580396e7d12ce4ce95a90017ef364b922bdc2d04b0b3d97 beta @@ -79,12 +76,12 @@ mokocassiopeia template site - 03.09.15 + 03.09.16 2026-04-14 https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/tag/release-candidate - https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/release-candidate/mokocassiopeia-03.09.15-rc.zip - https://github.com/mokoconsulting-tech/MokoCassiopeia/releases/download/release-candidate/mokocassiopeia-03.09.15-rc.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/release-candidate/mokocassiopeia-03.09.16-rc.zip + https://github.com/mokoconsulting-tech/MokoCassiopeia/releases/download/release-candidate/mokocassiopeia-03.09.16-rc.zip c2660acdf7389244462485f7ab4c286e9f851366a148acc16739a184576f7932 rc @@ -101,12 +98,12 @@ mokocassiopeia template site - 03.09.15 + 03.09.16 2026-04-14 https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/tag/v03 - https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/v03/mokocassiopeia-03.09.15.zip - https://github.com/mokoconsulting-tech/MokoCassiopeia/releases/download/v03/mokocassiopeia-03.09.15.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoCassiopeia/releases/download/v03/mokocassiopeia-03.09.16.zip + https://github.com/mokoconsulting-tech/MokoCassiopeia/releases/download/v03/mokocassiopeia-03.09.16.zip c2660acdf7389244462485f7ab4c286e9f851366a148acc16739a184576f7932 stable