diff --git a/.github/scripts/nightly-version.mjs b/.github/scripts/nightly-version.mjs index 2c977b7c4..26a38c220 100644 --- a/.github/scripts/nightly-version.mjs +++ b/.github/scripts/nightly-version.mjs @@ -34,7 +34,7 @@ const day = String(timestamp.getUTCDate()).padStart(2, '0'); const hours = String(timestamp.getUTCHours()).padStart(2, '0'); const minutes = String(timestamp.getUTCMinutes()).padStart(2, '0'); -const timeIdentifier = `${year}${month}${day}.${hours}${minutes}`; +const timeIdentifier = `${year}${month}${day}${hours}${minutes}`; const [, major, minor, patch] = match; console.log(`${major}.${minor}.${Number(patch) + 1}-nightly.${timeIdentifier}`); diff --git a/.github/scripts/set-tauri-version.mjs b/.github/scripts/set-tauri-version.mjs index 8abef5ba0..dea0f0e56 100644 --- a/.github/scripts/set-tauri-version.mjs +++ b/.github/scripts/set-tauri-version.mjs @@ -24,9 +24,13 @@ if (updaterEndpoint && !updaterEndpoint.startsWith('https://')) { const file = 'src-tauri/tauri.conf.json'; const config = JSON.parse(readFileSync(file, 'utf8')); -// Sanitize hyphens in prerelease portion for Apple iOS bundle-version compatibility (requires numbers separated by '.') +// Sanitize hyphens and leading zeroes in prerelease portion for SemVer 2.0.0 and iOS compatibility const sanitizedVersion = version.replace(/^(\d+\.\d+\.\d+-nightly)\.(.+)$/, (_, prefix, build) => { - return `${prefix}.${build.replace(/-/g, '.')}`; + const sanitizedBuild = build + .split(/[-.]/) + .map((part) => (/^\d+$/.test(part) ? String(Number(part)) : part)) + .join('.'); + return `${prefix}.${sanitizedBuild}`; }); config.version = sanitizedVersion;