diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9677cbb..8c9950f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,8 @@ jobs: Write-Host "$tag is new. Continuing with the signed application release." } + exit 0 + - name: Existing version — no release required if: steps.release_state.outputs.release_needed == 'false' shell: pwsh diff --git a/package-lock.json b/package-lock.json index 37e82d8..75908f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "spark-desktop", - "version": "0.1.3", + "version": "0.1.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "spark-desktop", - "version": "0.1.3", + "version": "0.1.4", "dependencies": { "@tauri-apps/api": "^2.10.0", "@tauri-apps/plugin-process": "^2.3.0", diff --git a/scripts/verify-versions.mjs b/scripts/verify-versions.mjs index 92ccea1..8f392a6 100644 --- a/scripts/verify-versions.mjs +++ b/scripts/verify-versions.mjs @@ -1,18 +1,30 @@ import fs from 'node:fs'; const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); +const packageLock = JSON.parse(fs.readFileSync('package-lock.json', 'utf8')); const tauri = JSON.parse(fs.readFileSync('src-tauri/tauri.conf.json', 'utf8')); const cargo = fs.readFileSync('src-tauri/Cargo.toml', 'utf8'); +const cargoLock = fs.readFileSync('src-tauri/Cargo.lock', 'utf8'); const cargoMatch = cargo.match(/^version\s*=\s*"([^"]+)"/m); +const cargoLockMatch = cargoLock.match( + /\[\[package\]\]\r?\nname\s*=\s*"spark-desktop"\r?\nversion\s*=\s*"([^"]+)"/, +); if (!cargoMatch) { throw new Error('Could not read the package version from src-tauri/Cargo.toml.'); } +if (!cargoLockMatch) { + throw new Error('Could not read the package version from src-tauri/Cargo.lock.'); +} + const versions = { packageJson: pkg.version, + packageLock: packageLock.version, + packageLockRoot: packageLock.packages[''].version, tauriConfig: tauri.version, cargoToml: cargoMatch[1], + cargoLock: cargoLockMatch[1], }; const unique = new Set(Object.values(versions)); diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 9f0eab5..32b0573 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3182,7 +3182,7 @@ dependencies = [ [[package]] name = "spark-desktop" -version = "0.1.3" +version = "0.1.4" dependencies = [ "serde", "serde_json",