From b970a98055c35fae49f12336ac91a46bfabd2086 Mon Sep 17 00:00:00 2001 From: Alexandr Stelnykovych Date: Fri, 21 Mar 2025 12:16:51 +0000 Subject: [PATCH] Bump binaries versions to v2 --- Earthfile | 6 +----- desktop/angular/package.json | 2 +- desktop/tauri/src-tauri/Cargo.toml | 2 +- desktop/tauri/src-tauri/tauri.conf.json5 | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Earthfile b/Earthfile index 653281a8..ad460c0f 100644 --- a/Earthfile +++ b/Earthfile @@ -445,11 +445,7 @@ tauri-build: DO rust+SET_CACHE_MOUNTS_ENV RUN rustup target add "${target}" - - # Init version information: VERSION, SOURCE, BUILD_TIME and VERSION_SemVer - DO +SET_VERSION_INFO - # Set version in Cargo.toml if it's a valid SemVer (required to set correct version of the output binary) - RUN if [ -n "$VERSION_SemVer" ]; then sed -i 's/^version = ".*"/version = "'"$VERSION_SemVer"'"/g' Cargo.toml; fi + # Build RUN --mount=$EARTHLY_RUST_TARGET_CACHE cargo tauri build --ci --target="${target}" --no-bundle DO rust+COPY_OUTPUT --output="${output}" diff --git a/desktop/angular/package.json b/desktop/angular/package.json index 1e1b8d9e..09f76063 100644 --- a/desktop/angular/package.json +++ b/desktop/angular/package.json @@ -1,6 +1,6 @@ { "name": "portmaster", - "version": "0.8.11", + "version": "2.0.0", "scripts": { "ng": "ng", "start": "npm install && npm run build-libs:dev && ng serve --proxy-config ./proxy.json", diff --git a/desktop/tauri/src-tauri/Cargo.toml b/desktop/tauri/src-tauri/Cargo.toml index 073cf8e1..432c1271 100644 --- a/desktop/tauri/src-tauri/Cargo.toml +++ b/desktop/tauri/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "portmaster" -version = "0.1.0" +version = "2.0.0" description = "Portmaster UI" authors = ["Safing"] license = "" diff --git a/desktop/tauri/src-tauri/tauri.conf.json5 b/desktop/tauri/src-tauri/tauri.conf.json5 index ed63d729..4d0e7e8a 100644 --- a/desktop/tauri/src-tauri/tauri.conf.json5 +++ b/desktop/tauri/src-tauri/tauri.conf.json5 @@ -39,7 +39,6 @@ } }, "productName": "Portmaster", - //"version": "0.1.3", // If removed - the version number from Cargo.toml is used. "identifier": "io.safing.portmaster", // this is added as a property to the shortcut on windows (ApplicationUserModelID). Used for notifications. "app": { "withGlobalTauri": true,