From 4563a0490c2d3dca10f3cfe46198758c94dede45 Mon Sep 17 00:00:00 2001 From: enricobuehler Date: Tue, 30 Jun 2026 19:22:42 +0200 Subject: [PATCH] chore(release): bump workspace version to 0.4.1; canary base to 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The [workspace.package] version (inherited by every crate via version.workspace) lagged at 0.3.0 through the 0.4.0 release — bump it to 0.4.1, the release being cut, and refresh the 8 workspace entries in Cargo.lock to match (CI builds --locked). Also advance the CI canary-base fallbacks (deb/rpm/flatpak/android/release workflows + build-rpm.sh) from 0.3.0 to 0.5.0 so main/canary builds sort one minor ahead of the latest stable line, per the documented channel convention. Co-Authored-By: Claude Opus 4.8 --- .gitea/workflows/android.yml | 2 +- .gitea/workflows/deb.yml | 6 +++--- .gitea/workflows/flatpak.yml | 4 ++-- .gitea/workflows/release.yml | 2 +- .gitea/workflows/rpm.yml | 6 +++--- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- packaging/rpm/build-rpm.sh | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/android.yml b/.gitea/workflows/android.yml index ee189d7..665fae2 100644 --- a/.gitea/workflows/android.yml +++ b/.gitea/workflows/android.yml @@ -80,7 +80,7 @@ jobs: run: | case "$GITHUB_REF" in refs/tags/v*) VN="${GITHUB_REF_NAME#v}"; TRACK="alpha" ;; # alpha = built-in closed testing - *) VN="0.3.0-ci${GITHUB_RUN_NUMBER}"; TRACK="internal" ;; + *) VN="0.5.0-ci${GITHUB_RUN_NUMBER}"; TRACK="internal" ;; esac echo "VERSION_NAME=$VN" >> "$GITHUB_ENV" echo "PLAY_TRACK=$TRACK" >> "$GITHUB_ENV" diff --git a/.gitea/workflows/deb.yml b/.gitea/workflows/deb.yml index 1ff51d6..31b9de9 100644 --- a/.gitea/workflows/deb.yml +++ b/.gitea/workflows/deb.yml @@ -36,8 +36,8 @@ jobs: - name: Version + channel # vX.Y.Z tag -> X.Y.Z, published to the `stable` apt distribution (a real release). - # A main push -> 0.3.0~ciN.g, published to the `canary` distribution: the '~' sorts - # below the eventual 0.3.0 tag, it climbs monotonically by run number, and the canary base + # A main push -> 0.5.0~ciN.g, published to the `canary` distribution: the '~' sorts + # below the eventual 0.5.0 tag, it climbs monotonically by run number, and the canary base # stays one minor AHEAD of the latest stable so a stable->canary box re-point still moves # forward (see channels.md). Computed BEFORE the build so it's stamped into the binary # (PUNKTFUNK_BUILD_VERSION -> build.rs -> --version). @@ -45,7 +45,7 @@ jobs: SHORT=$(echo "$GITHUB_SHA" | cut -c1-8) case "$GITHUB_REF" in refs/tags/v*) V="${GITHUB_REF_NAME#v}"; DIST=stable ;; - *) V="0.3.0~ci${GITHUB_RUN_NUMBER}.g${SHORT}"; DIST=canary ;; + *) V="0.5.0~ci${GITHUB_RUN_NUMBER}.g${SHORT}"; DIST=canary ;; esac echo "VERSION=$V" >> "$GITHUB_ENV" echo "DISTRIBUTION=$DIST" >> "$GITHUB_ENV" diff --git a/.gitea/workflows/flatpak.yml b/.gitea/workflows/flatpak.yml index baeee86..2b9ff75 100644 --- a/.gitea/workflows/flatpak.yml +++ b/.gitea/workflows/flatpak.yml @@ -73,7 +73,7 @@ jobs: - name: Version + channel # Tag vX.Y.Z -> X.Y.Z on the OSTree `stable` branch (a real release); a main push -> - # 0.3.0-ciN.g on the `canary` branch. The two branches live side-by-side in one repo + # 0.5.0-ciN.g on the `canary` branch. The two branches live side-by-side in one repo # (rsync runs without --delete), each tracked by its own .flatpakref, so `flatpak update` # on a stable box never jumps to a canary build. The generic-registry version string allows # letters/dots/hyphens. @@ -81,7 +81,7 @@ jobs: SHORT=$(echo "$GITHUB_SHA" | cut -c1-8) case "$GITHUB_REF" in refs/tags/v*) V="${GITHUB_REF_NAME#v}"; BRANCH=stable; ALIAS=latest ;; - *) V="0.3.0-ci${GITHUB_RUN_NUMBER}.g${SHORT}"; BRANCH=canary; ALIAS=canary ;; + *) V="0.5.0-ci${GITHUB_RUN_NUMBER}.g${SHORT}"; BRANCH=canary; ALIAS=canary ;; esac echo "VERSION=$V" >> "$GITHUB_ENV" echo "BUNDLE=punktfunk-client-${V}.flatpak" >> "$GITHUB_ENV" diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 5793fe1..cb6df66 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -101,7 +101,7 @@ jobs: run: | case "$GITHUB_REF" in refs/tags/v*) V="${GITHUB_REF_NAME#v}"; V="${V%%-*}" ;; # App Store marketing version is numeric X.Y.Z (drop -rc) - *) V="0.3.0" ;; # canary marketing version; the build number disambiguates + *) V="0.5.0" ;; # canary marketing version; the build number disambiguates esac echo "VERSION=$V" >> "$GITHUB_ENV" echo "BUILD_NUM=$GITHUB_RUN_NUMBER" >> "$GITHUB_ENV" diff --git a/.gitea/workflows/rpm.yml b/.gitea/workflows/rpm.yml index f9ee608..bc82a8d 100644 --- a/.gitea/workflows/rpm.yml +++ b/.gitea/workflows/rpm.yml @@ -68,8 +68,8 @@ jobs: restore-keys: cargo-home- - name: Version + channel - # vX.Y.Z tag -> X.Y.Z-1 in the base group (a real release); main push -> 0.3.0-0.ciN.g - # in the `-canary` group, whose "0." release sorts below the eventual 0.3.0-1 yet + # vX.Y.Z tag -> X.Y.Z-1 in the base group (a real release); main push -> 0.5.0-0.ciN.g + # in the `-canary` group, whose "0." release sorts below the eventual 0.5.0-1 yet # climbs by run number. The canary base stays one minor ahead of the latest stable so a # stable->canary box re-point still moves forward. The spec %build stamps # PUNKTFUNK_BUILD_VERSION from these macros into the binary (--version provenance). @@ -77,7 +77,7 @@ jobs: SHORT=$(echo "$GITHUB_SHA" | cut -c1-8) case "$GITHUB_REF" in refs/tags/v*) V="${GITHUB_REF_NAME#v}"; R="1"; GROUP="${{ matrix.group }}" ;; - *) V="0.3.0"; R="0.ci${GITHUB_RUN_NUMBER}.g${SHORT}"; GROUP="${{ matrix.group }}-canary" ;; + *) V="0.5.0"; R="0.ci${GITHUB_RUN_NUMBER}.g${SHORT}"; GROUP="${{ matrix.group }}-canary" ;; esac echo "PF_VERSION=$V" >> "$GITHUB_ENV" echo "PF_RELEASE=$R" >> "$GITHUB_ENV" diff --git a/Cargo.lock b/Cargo.lock index bf997d6..91e8d57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1995,7 +1995,7 @@ dependencies = [ [[package]] name = "latency-probe" -version = "0.3.0" +version = "0.4.1" [[package]] name = "lazy_static" @@ -2127,7 +2127,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "loss-harness" -version = "0.3.0" +version = "0.4.1" dependencies = [ "punktfunk-core", ] @@ -2720,7 +2720,7 @@ dependencies = [ [[package]] name = "punktfunk-client-android" -version = "0.3.0" +version = "0.4.1" dependencies = [ "android_logger", "jni", @@ -2734,7 +2734,7 @@ dependencies = [ [[package]] name = "punktfunk-client-linux" -version = "0.3.0" +version = "0.4.1" dependencies = [ "anyhow", "async-channel", @@ -2754,7 +2754,7 @@ dependencies = [ [[package]] name = "punktfunk-client-windows" -version = "0.3.0" +version = "0.4.1" dependencies = [ "anyhow", "async-channel", @@ -2774,7 +2774,7 @@ dependencies = [ [[package]] name = "punktfunk-core" -version = "0.3.0" +version = "0.4.1" dependencies = [ "aes-gcm", "bytes", @@ -2804,7 +2804,7 @@ dependencies = [ [[package]] name = "punktfunk-host" -version = "0.3.0" +version = "0.4.1" dependencies = [ "aes", "aes-gcm", @@ -2870,7 +2870,7 @@ dependencies = [ [[package]] name = "punktfunk-probe" -version = "0.3.0" +version = "0.4.1" dependencies = [ "anyhow", "mdns-sd", diff --git a/Cargo.toml b/Cargo.toml index edc8212..4128434 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ exclude = ["packaging/linux/steam-deck-gadget/usbip-poc"] [workspace.package] -version = "0.3.0" +version = "0.4.1" edition = "2021" rust-version = "1.82" license = "MIT OR Apache-2.0" diff --git a/packaging/rpm/build-rpm.sh b/packaging/rpm/build-rpm.sh index 83052cd..ee9c0e2 100755 --- a/packaging/rpm/build-rpm.sh +++ b/packaging/rpm/build-rpm.sh @@ -9,7 +9,7 @@ # Output: dist/punktfunk--..rpm (+ the -debuginfo/-debugsource subpkgs) set -euo pipefail -PF_VERSION="${PF_VERSION:-0.3.0}" # canary base; keep one minor ahead of the latest stable release +PF_VERSION="${PF_VERSION:-0.5.0}" # canary base; keep one minor ahead of the latest stable release PF_RELEASE="${PF_RELEASE:-1}" # PF_WITH_WEB=1 builds the punktfunk-web subpackage too (needs `bun` on PATH — present in the CI # builder image, not in a plain mock chroot). Default off so a bare `rpmbuild`/COPR still works.