YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-10-29 01:02:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] support hotfix versions in Android signing

Browse Source
This commit is contained in:
dijunkun
2026-10-26 17:50:11 +08:00
parent 9f7411e5c0
commit 1be7b8d228
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/sign-android.yml
+5 -5
View File
@@ -4,7 +4,7 @@ on:
workflow_call: workflow_call:
inputs: inputs:
version: version:
description: "Android artifact version, for example v1.6.0-20261002." description: "Android artifact version, for example v1.7.3-20261026 or v1.7.3-1-20261026."
required: true required: true
type: string type: string
secrets: secrets:
@@ -19,7 +19,7 @@ on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
source_tag: source_tag:
description: "Existing Android release to sign without rebuilding, for example android-v1.6.0-20261002." description: "Existing Android release to sign without rebuilding, for example android-v1.7.3-1-20261026."
required: true required: true
type: string type: string
@@ -61,11 +61,11 @@ jobs:
if os.environ["GITHUB_EVENT_NAME"] == "workflow_dispatch" and not version: if os.environ["GITHUB_EVENT_NAME"] == "workflow_dispatch" and not version:
tag = os.environ["SOURCE_TAG"] tag = os.environ["SOURCE_TAG"]
if not tag.startswith("android-v"): if not tag.startswith("android-v"):
raise ValueError("Use an existing android-v<app-version>-YYYYMMDD release") raise ValueError("Use an existing android-v<app-version>[-<patch>]-YYYYMMDD release")
version = tag.removeprefix("android-") version = tag.removeprefix("android-")
match = re.fullmatch(r"v[0-9]+\.[0-9]+\.[0-9]+-([0-9]{8})", version) match = re.fullmatch(r"v[0-9]+\.[0-9]+\.[0-9]+(?:-[0-9]+)?-([0-9]{8})", version)
if not match: if not match:
raise ValueError("Invalid Android artifact version") raise ValueError("Invalid Android artifact version; expected v<app-version>[-<patch>]-YYYYMMDD")
datetime.datetime.strptime(match[1], "%Y%m%d") datetime.datetime.strptime(match[1], "%Y%m%d")
with open(os.environ["GITHUB_OUTPUT"], "a") as stream: with open(os.environ["GITHUB_OUTPUT"], "a") as stream:
stream.write(f"version={version}\n") stream.write(f"version={version}\n")