diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b3b5684..f9e5f5f 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,4 +1,4 @@ { ".": "0.4.0-b", - "desktop": "0.3.0" + "desktop": "0.4.0-b" } diff --git a/desktop/VERSION b/desktop/VERSION index 0d91a54..8d1a53c 100644 --- a/desktop/VERSION +++ b/desktop/VERSION @@ -1 +1 @@ -0.3.0 +0.4.0-b diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 962ca19..b039307 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -1,12 +1,12 @@ { "name": "vidxp-desktop", - "version": "0.3.0", + "version": "0.4.0-b", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vidxp-desktop", - "version": "0.3.0", + "version": "0.4.0-b", "devDependencies": { "@tauri-apps/cli": "2.11.4" } diff --git a/desktop/package.json b/desktop/package.json index ec701f5..d300dab 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,7 +1,7 @@ { "name": "vidxp-desktop", "private": true, - "version": "0.3.0", + "version": "0.4.0-b", "type": "module", "scripts": { "tauri": "tauri", diff --git a/desktop/runtime-manifest.json b/desktop/runtime-manifest.json index 9fb13ee..9951b4c 100644 --- a/desktop/runtime-manifest.json +++ b/desktop/runtime-manifest.json @@ -1,6 +1,6 @@ { "schema_version": 1, - "desktop_version": "0.3.0", + "desktop_version": "0.4.0-b", "package_name": "vidxp", "package_version": "0.4.0-b", "dependency_index": "https://pypi.org/simple", diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock index 1ca8142..06cf314 100644 --- a/desktop/src-tauri/Cargo.lock +++ b/desktop/src-tauri/Cargo.lock @@ -4373,7 +4373,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vidxp-desktop" -version = "0.3.0" # x-release-please-version +version = "0.4.0-b" # x-release-please-version dependencies = [ "atomic-write-file", "hex", diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index d6f17a7..0280c49 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vidxp-desktop" -version = "0.3.0" # x-release-please-version +version = "0.4.0-b" # x-release-please-version description = "The VidXP desktop launcher and local runtime supervisor" edition = "2024" rust-version = "1.97" diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json index c270063..663588c 100644 --- a/desktop/src-tauri/tauri.conf.json +++ b/desktop/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "VidXP", - "version": "0.3.0", + "version": "0.4.0-b", "identifier": "dev.grayhat.vidxp", "build": { "frontendDist": "../web" diff --git a/release-please-config.json b/release-please-config.json index fc92393..e74a9f2 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -5,7 +5,6 @@ "bump-patch-for-minor-pre-major": false, "draft": true, "force-tag-creation": true, - "group-pull-request-title-pattern": "chore(release): prepare ${branch}", "include-v-in-tag": true, "prerelease": true, "separate-pull-requests": false, @@ -15,14 +14,13 @@ "type": "linked-versions", "groupName": "VidXP", "components": [ - "vidxp", + "", "desktop" ] } ], "packages": { ".": { - "component": "vidxp", "exclude-paths": [ "desktop" ], diff --git a/release-please-config.stable.json b/release-please-config.stable.json index dfb9d38..ae6f200 100644 --- a/release-please-config.stable.json +++ b/release-please-config.stable.json @@ -5,7 +5,6 @@ "bump-patch-for-minor-pre-major": false, "draft": true, "force-tag-creation": true, - "group-pull-request-title-pattern": "chore(release): prepare ${branch}", "include-v-in-tag": true, "separate-pull-requests": false, "plugins": [ @@ -13,14 +12,13 @@ "type": "linked-versions", "groupName": "VidXP", "components": [ - "vidxp", + "", "desktop" ] } ], "packages": { ".": { - "component": "vidxp", "exclude-paths": [ "desktop" ], diff --git a/tests/test_packaging.py b/tests/test_packaging.py index bdc4c9f..ba7c0ce 100644 --- a/tests/test_packaging.py +++ b/tests/test_packaging.py @@ -337,15 +337,19 @@ def test_release_please_preserves_desktop_manifests_and_links_versions(self): config = json.loads( (ROOT / filename).read_text(encoding="utf-8") ) + self.assertNotIn("group-pull-request-title-pattern", config) linked_versions = [ plugin for plugin in config["plugins"] if plugin["type"] == "linked-versions" ] self.assertEqual(len(linked_versions), 1, filename) + root_package = config["packages"]["."] + self.assertFalse(root_package["include-component-in-tag"]) + self.assertNotIn("component", root_package) self.assertEqual( set(linked_versions[0]["components"]), - {"vidxp", "desktop"}, + {"", "desktop"}, filename, )