mirror of
https://github.com/open-jarvis/OpenJarvis.git
synced 2026-07-28 14:07:55 +00:00
fix(ci): desktop — translate PEP 440 .devN to SemVer for Tauri (#360)
Tauri's build script enforces strict SemVer (`MAJOR.MINOR.PATCH[-pre][+build]`) on `tauri.conf.json > version`, but the autotag scheme introduced in #358 emits PEP 440 dev releases like `1.0.2.dev661` — PEP 440 separates dev with `.`, SemVer requires `-`. First post-#358 desktop run failed with: tauri.conf.json > version must be a semver string PyPI requires PEP 440; Tauri requires SemVer. They genuinely don't agree on `.devN`. Translate just for the Tauri bundle: 1.0.2.dev661 -> 1.0.2-dev.661 (valid SemVer prerelease) 1.0.2 -> 1.0.2 (passthrough) 1.0.0-rc.1 -> 1.0.0-rc.1 (passthrough) Tag, git history, PyPI wheel, and the updater's `latest.json` all keep the PEP 440 form. Only the embedded bundle version uses SemVer, and the comparison the updater does is bundle-vs-latest.json (both SemVer now) so the upgrade path stays consistent. Failing run for reference: 26118619500 Co-authored-by: krypticmouse <herumbshandilya123@gmail.com>
This commit is contained in:
co-authored by
krypticmouse
parent
4668ea0b7f
commit
289fcb00e2
@@ -188,6 +188,12 @@ jobs:
|
||||
echo "prerelease=true" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
|
||||
# Tauri's build script requires strict SemVer (MAJOR.MINOR.PATCH[-pre][+build]).
|
||||
# PEP 440 dev releases (`1.0.2.dev661`) are NOT valid SemVer, so we
|
||||
# translate `.devN` to the SemVer-equivalent `-dev.N` prerelease form.
|
||||
# PyPI keeps the PEP 440 form; only the Tauri bundle uses SemVer.
|
||||
TAURI_VERSION="${VERSION/.dev/-dev.}"
|
||||
echo "tauri_version=${TAURI_VERSION}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Configure Apple signing
|
||||
if: runner.os == 'macOS'
|
||||
@@ -223,7 +229,7 @@ jobs:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
||||
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
|
||||
TAURI_CONFIG: '{"version":"${{ steps.release-info.outputs.version }}","bundle":{"externalBin":["binaries/ollama"]}}'
|
||||
TAURI_CONFIG: '{"version":"${{ steps.release-info.outputs.tauri_version }}","bundle":{"externalBin":["binaries/ollama"]}}'
|
||||
with:
|
||||
projectPath: frontend
|
||||
tauriScript: npx tauri
|
||||
|
||||
Reference in New Issue
Block a user