Compare commits

...
2 Commits
Author SHA1 Message Date
Aleksandr Bogomiakov 9dec056349 Prepare the 1.0.0 release
Set all seven workspace package versions to 1.0.0 and align their explicit
internal dependency requirements, Cargo.lock entries and Nix package version.
The CLI, agent status and tray now report 1.0.0 rather than 0.1.0. Release
packaging derives its version from the v1.0.0 tag through the existing
workflows, which classify the tag as a stable release.

This is a software version change only. Keep protocol wire versions, identity
derivation, handshake encoding and storage schemas unchanged; no data migration
or protocol upgrade is introduced relative to the current RC. External locked
dependencies are unchanged. Each protocol crate retains its own version field.

Validation on macOS:
- cargo fmt --all -- --check
- cargo clippy --locked --workspace --all-targets -- -D warnings
- cargo test --locked --workspace --all-targets: 532 passed, 2 ignored
- target/debug/tsng --version reports tsng 1.0.0
- Cargo metadata confirms all seven workspace packages are 1.0.0
- Compared Cargo.lock external package entries with HEAD: unchanged
- git diff --check

Tests ran outside the sandbox so real local test agents could open sockets.
Linux/Windows release builds, native desktop GUI and Nix builds were not run.
Commit and release tag are local; publishing is left to the user.
2026-11-16 15:03:52 +00:00
Aleksandr Bogomiakov 91227afbac Publish GitHub releases to the Arch package repository
After release assets have all uploaded, dispatch the exact repository and tag to
house-of-vanity/arch_repo using the ARCH_REPO_TOKEN Actions secret. Keep this in a
separate job so notification failures can be retried without rebuilding a release;
a missing token fails with an actionable message. Document repository setup,
installation, publication status and recovery.

Fix Arch version ordering discovered during integration: 0.1.0_rc.10 sorts above
0.1.0 in pacman. Attach prerelease suffixes directly and add epoch 1 so existing
installations can migrate and later upgrade to stable. Keep the epoch out of
filenames and align both GitHub and Gitea packaging filenames. Git tags and
application versions are unchanged. Add real packaging/vercmp checks.

Validation: Arch packaging and version-order checks passed in an Arch Linux
Docker container, including CLI and GUI packages. cargo fmt --all -- --check,
cargo clippy --locked --workspace --all-targets -- -D warnings and cargo test
--locked --workspace --all-targets passed on macOS (default ignored tests stayed
ignored). GitHub release workflow passed actionlint. Running GitHub actionlint
on the Gitea workflow only reported its deliberately retained v3 artifact actions,
which are supported by Gitea but retired on GitHub. git diff --check passed.
2026-11-16 14:40:12 +00:00
14 changed files with 120 additions and 32 deletions

No files matched your search

+2 -2
View File
@@ -237,7 +237,7 @@ jobs:
run: | run: |
set -euo pipefail set -euo pipefail
version="${GITHUB_REF_NAME#v}" version="${GITHUB_REF_NAME#v}"
pkgver="${version//-/_}" pkgver="${version//-/}"
bash dist/arch/build-pkg.sh \ bash dist/arch/build-pkg.sh \
"target/${{ matrix.target }}/release/tsng" \ "target/${{ matrix.target }}/release/tsng" \
"${{ matrix.pkg_arch }}" \ "${{ matrix.pkg_arch }}" \
@@ -252,7 +252,7 @@ jobs:
run: | run: |
set -euo pipefail set -euo pipefail
version="${GITHUB_REF_NAME#v}" version="${GITHUB_REF_NAME#v}"
pkgver="${version//-/_}" pkgver="${version//-/}"
tray="target/${{ matrix.gnu_target }}/release/tsunagi-tray" tray="target/${{ matrix.gnu_target }}/release/tsunagi-tray"
bash dist/deb/build-deb.sh \ bash dist/deb/build-deb.sh \
"target/${{ matrix.target }}/release/tsng" \ "target/${{ matrix.target }}/release/tsng" \
+24 -2
View File
@@ -239,7 +239,7 @@ jobs:
run: | run: |
set -euo pipefail set -euo pipefail
version="${GITHUB_REF_NAME#v}" version="${GITHUB_REF_NAME#v}"
pkgver="${version//-/_}" pkgver="${version//-/}"
bash dist/arch/build-pkg.sh \ bash dist/arch/build-pkg.sh \
"target/${{ matrix.target }}/release/tsng" \ "target/${{ matrix.target }}/release/tsng" \
"${{ matrix.pkg_arch }}" \ "${{ matrix.pkg_arch }}" \
@@ -254,7 +254,7 @@ jobs:
run: | run: |
set -euo pipefail set -euo pipefail
version="${GITHUB_REF_NAME#v}" version="${GITHUB_REF_NAME#v}"
pkgver="${version//-/_}" pkgver="${version//-/}"
tray="target/${{ matrix.gnu_target }}/release/tsunagi-tray" tray="target/${{ matrix.gnu_target }}/release/tsunagi-tray"
bash dist/deb/build-deb.sh \ bash dist/deb/build-deb.sh \
"target/${{ matrix.target }}/release/tsng" \ "target/${{ matrix.target }}/release/tsng" \
@@ -320,3 +320,25 @@ jobs:
--verify-tag \ --verify-tag \
"${prerelease[@]}" "${prerelease[@]}"
fi fi
notify-arch-repository:
name: Publish packages to the Arch repository
needs: publish
if: ${{ github.server_url == 'https://github.com' }}
runs-on: ubuntu-latest
permissions: {}
steps:
- name: Notify arch_repo of the completed release
shell: bash
env:
GH_TOKEN: ${{ secrets.ARCH_REPO_TOKEN }}
RELEASE_TAG: ${{ github.ref_name }}
run: |
set -euo pipefail
if [[ -z "$GH_TOKEN" ]]; then
echo '::error::Set the ARCH_REPO_TOKEN Actions secret with Contents: write access to house-of-vanity/arch_repo.'
exit 1
fi
jq -n --arg repository "$GITHUB_REPOSITORY" --arg tag "$RELEASE_TAG" \
'{event_type: "new_package", client_payload: {repository: $repository, tag: $tag}}' \
| gh api --method POST repos/house-of-vanity/arch_repo/dispatches --input -
Generated
+7 -7
View File
@@ -6296,7 +6296,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]] [[package]]
name = "tsunagi" name = "tsunagi"
version = "0.1.0" version = "1.0.0"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@@ -6320,7 +6320,7 @@ dependencies = [
[[package]] [[package]]
name = "tsunagi-awg" name = "tsunagi-awg"
version = "0.1.0" version = "1.0.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"iroh", "iroh",
@@ -6335,7 +6335,7 @@ dependencies = [
[[package]] [[package]]
name = "tsunagi-core" name = "tsunagi-core"
version = "0.1.0" version = "1.0.0"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"bytes", "bytes",
@@ -6377,7 +6377,7 @@ dependencies = [
[[package]] [[package]]
name = "tsunagi-tcp-tls" name = "tsunagi-tcp-tls"
version = "0.1.0" version = "1.0.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"caps", "caps",
@@ -6397,7 +6397,7 @@ dependencies = [
[[package]] [[package]]
name = "tsunagi-tray" name = "tsunagi-tray"
version = "0.1.0" version = "1.0.0"
dependencies = [ dependencies = [
"eframe", "eframe",
"egui-phosphor", "egui-phosphor",
@@ -6412,7 +6412,7 @@ dependencies = [
[[package]] [[package]]
name = "tsunagi-wg-quic" name = "tsunagi-wg-quic"
version = "0.1.0" version = "1.0.0"
dependencies = [ dependencies = [
"boringtun", "boringtun",
"bytes", "bytes",
@@ -6439,7 +6439,7 @@ dependencies = [
[[package]] [[package]]
name = "tsunagi-wireguard" name = "tsunagi-wireguard"
version = "0.1.0" version = "1.0.0"
dependencies = [ dependencies = [
"boringtun", "boringtun",
"bytes", "bytes",
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "tsunagi-awg" name = "tsunagi-awg"
version = "0.1.0" version = "1.0.0"
description = "Ephemeral pairwise Amnezia transport for Tsunagi." description = "Ephemeral pairwise Amnezia transport for Tsunagi."
edition.workspace = true edition.workspace = true
rust-version.workspace = true rust-version.workspace = true
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "tsunagi-core" name = "tsunagi-core"
version = "0.1.0" version = "1.0.0"
description = "Small private mesh networks: persistent agent identity, deterministic network spaces, an iroh control plane, signed state and a local DNS view." description = "Small private mesh networks: persistent agent identity, deterministic network spaces, an iroh control plane, signed state and a local DNS view."
readme = "../../README.md" readme = "../../README.md"
keywords = ["mesh", "p2p", "iroh", "networking"] keywords = ["mesh", "p2p", "iroh", "networking"]
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "tsunagi-tcp-tls" name = "tsunagi-tcp-tls"
version = "0.1.0" version = "1.0.0"
description = "TCP TLS carrier for independently encrypted tsunagi mesh traffic." description = "TCP TLS carrier for independently encrypted tsunagi mesh traffic."
edition.workspace = true edition.workspace = true
rust-version.workspace = true rust-version.workspace = true
@@ -8,7 +8,7 @@ license.workspace = true
repository.workspace = true repository.workspace = true
[dependencies] [dependencies]
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0" } tsunagi-core = { path = "../tsunagi-core", version = "1.0.0" }
iroh.workspace = true iroh.workspace = true
tokio = { workspace = true, features = ["net", "io-util", "time", "sync", "macros"] } tokio = { workspace = true, features = ["net", "io-util", "time", "sync", "macros"] }
rustls = "0.23" rustls = "0.23"
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "tsunagi-tray" name = "tsunagi-tray"
version = "0.1.0" version = "1.0.0"
description = "Tray application to manage a running tsunagi agent." description = "Tray application to manage a running tsunagi agent."
edition.workspace = true edition.workspace = true
rust-version.workspace = true rust-version.workspace = true
@@ -15,7 +15,7 @@ path = "src/main.rs"
# The agent control client and the report types: the GUI is a thin client over # The agent control client and the report types: the GUI is a thin client over
# the same local control interface the CLI uses, so it reuses these directly # the same local control interface the CLI uses, so it reuses these directly
# and never re-implements the protocol. # and never re-implements the protocol.
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0" } tsunagi-core = { path = "../tsunagi-core", version = "1.0.0" }
# Native, lightweight GUI — no web engine. eframe re-exports egui. # Native, lightweight GUI — no web engine. eframe re-exports egui.
eframe = { version = "0.31", default-features = false, features = ["default_fonts", "glow", "wayland", "x11"] } eframe = { version = "0.31", default-features = false, features = ["default_fonts", "glow", "wayland", "x11"] }
# Cross-platform tray icon + menu (Windows tray, macOS menu bar, Linux SNI). # Cross-platform tray icon + menu (Windows tray, macOS menu bar, Linux SNI).
+2 -2
View File
@@ -3,7 +3,7 @@ name = "tsunagi-wg-quic"
# Its own version, and deliberately separate from the wire version it # Its own version, and deliberately separate from the wire version it
# negotiates: a release here does not stop it talking to a peer on an older # negotiates: a release here does not stop it talking to a peer on an older
# build, because what peers compare is `ANNOUNCEMENT_VERSION`. # build, because what peers compare is `ANNOUNCEMENT_VERSION`.
version = "0.1.0" version = "1.0.0"
description = "The single internal WireGuard tunnel for tsunagi, independent of external carriers." description = "The single internal WireGuard tunnel for tsunagi, independent of external carriers."
edition.workspace = true edition.workspace = true
rust-version.workspace = true rust-version.workspace = true
@@ -11,7 +11,7 @@ license.workspace = true
repository.workspace = true repository.workspace = true
[dependencies] [dependencies]
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0" } tsunagi-core = { path = "../tsunagi-core", version = "1.0.0" }
iroh.workspace = true iroh.workspace = true
tokio.workspace = true tokio.workspace = true
serde.workspace = true serde.workspace = true
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "tsunagi-wireguard" name = "tsunagi-wireguard"
version = "0.1.0" version = "1.0.0"
description = "Independent authenticated WireGuard and Amnezia UDP carriers for tsunagi." description = "Independent authenticated WireGuard and Amnezia UDP carriers for tsunagi."
edition.workspace = true edition.workspace = true
rust-version.workspace = true rust-version.workspace = true
@@ -8,7 +8,7 @@ license = "WTFPL AND Apache-2.0"
repository.workspace = true repository.workspace = true
[dependencies] [dependencies]
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0" } tsunagi-core = { path = "../tsunagi-core", version = "1.0.0" }
iroh.workspace = true iroh.workspace = true
tokio = { workspace = true, features = ["net", "io-util", "time", "sync", "macros"] } tokio = { workspace = true, features = ["net", "io-util", "time", "sync", "macros"] }
serde.workspace = true serde.workspace = true
+6 -6
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "tsunagi" name = "tsunagi"
version = "0.1.0" version = "1.0.0"
description = "The tsunagi command line agent." description = "The tsunagi command line agent."
edition.workspace = true edition.workspace = true
rust-version.workspace = true rust-version.workspace = true
@@ -12,11 +12,11 @@ name = "tsng"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0", features = ["tun-device", "dns-publish"] } tsunagi-core = { path = "../tsunagi-core", version = "1.0.0", features = ["tun-device", "dns-publish"] }
tsunagi-wireguard = { path = "../tsunagi-wireguard", version = "0.1.0" } tsunagi-wireguard = { path = "../tsunagi-wireguard", version = "1.0.0" }
tsunagi-awg = { path = "../tsunagi-awg", version = "0.1.0" } tsunagi-awg = { path = "../tsunagi-awg", version = "1.0.0" }
tsunagi-wg-quic = { path = "../tsunagi-wg-quic", version = "0.1.0" } tsunagi-wg-quic = { path = "../tsunagi-wg-quic", version = "1.0.0" }
tsunagi-tcp-tls = { path = "../tsunagi-tcp-tls", version = "0.1.0" } tsunagi-tcp-tls = { path = "../tsunagi-tcp-tls", version = "1.0.0" }
iroh.workspace = true iroh.workspace = true
tokio = { version = "1.53", features = ["rt", "rt-multi-thread", "sync", "time", "macros", "signal"] } tokio = { version = "1.53", features = ["rt", "rt-multi-thread", "sync", "time", "macros", "signal"] }
tracing.workspace = true tracing.workspace = true
+34
View File
@@ -55,3 +55,37 @@ sudo pacman -R tsunagi
stops and disables the service. The `tsunagi` user and `/var/lib/tsunagi` are stops and disables the service. The `tsunagi` user and `/var/lib/tsunagi` are
left in place; remove them by hand if you want them gone. left in place; remove them by hand if you want them gone.
## Automatic package repository
GitHub releases are also published to the Arch repository after all release
assets have uploaded. Add this to `/etc/pacman.conf`:
```ini
[btwiusearch.net]
SigLevel = Optional TrustAll
Server = https://btwiusearch.net/arch_repo/$arch/
```
Install with `sudo pacman -Syu tsunagi`, or `sudo pacman -Syu tsunagi-gui` for
the x86_64 desktop variant. Subsequent versions arrive through `pacman -Syu`.
Prerelease tags are included. ARM packages are provided for `aarch64` and `armv7h`.
Maintainers must set the `ARCH_REPO_TOKEN` Actions secret to a fine-grained token
with **Contents: Read and write** permission on `house-of-vanity/arch_repo` only.
The separate notification job fails clearly if the secret is missing; the built
release remains available. Once the secret is configured, rerun the failed job.
A successful notification schedules publication; check the
[Arch repository workflow](https://github.com/house-of-vanity/arch_repo/actions/workflows/update_repo.yaml)
for the deployment result. A manual run there can import an existing tag without
rebuilding it. Repository setup and recovery are documented in
[arch_repo](https://github.com/house-of-vanity/arch_repo#github-setup).
Arch package versions use epoch `1` and spell prereleases as `0.1.0rc.33`, so
pacman upgrades correctly from RC to stable. The epoch also migrates packages
installed using the former `0.1.0_rc.33` spelling. It appears in pacman's version
metadata, not in archive filenames. This does not change the Git tag or the
application's version string.
Package/version checks can be run on Arch Linux with `python`, `libarchive`, and
`zstd` installed: `bash dist/arch/test-pkg.sh`.
+7 -4
View File
@@ -24,10 +24,13 @@ here="$(cd "$(dirname "$0")" && pwd)"
root="$(mktemp -d)" root="$(mktemp -d)"
trap 'rm -rf "$root"' EXIT trap 'rm -rf "$root"' EXIT
# pacman pkgver may not contain '-', so a prerelease tag like 0.1.0-rc.9 becomes # Attach the prerelease suffix directly: vercmp orders 0.1.0rc.9 < 0.1.0,
# 0.1.0_rc.9. # whereas the old 0.1.0_rc.9 spelling sorts ABOVE the stable release. Epoch 1
pkgver="$(printf '%s' "$version" | tr '-' '_')" # ensures existing installations can upgrade from the old spelling as well.
# The epoch is metadata only; it does not appear in package filenames.
pkgver="$(printf '%s' "$version" | tr -d '-')"
pkgrel=1 pkgrel=1
epoch=1
# Payload. Arch keeps units under /usr/lib/systemd/system and installs to # Payload. Arch keeps units under /usr/lib/systemd/system and installs to
# /usr/bin, so the service's ExecStart is rewritten to match. # /usr/bin, so the service's ExecStart is rewritten to match.
@@ -67,7 +70,7 @@ size="$(du -sb "$root" | cut -f1)"
cat > "$root/.PKGINFO" <<PKGINFO cat > "$root/.PKGINFO" <<PKGINFO
pkgname = ${pkgname} pkgname = ${pkgname}
pkgver = ${pkgver}-${pkgrel} pkgver = ${epoch}:${pkgver}-${pkgrel}
pkgdesc = ${pkgdesc} pkgdesc = ${pkgdesc}
url = https://github.com/house-of-vanity/tsunagi url = https://github.com/house-of-vanity/tsunagi
builddate = $(date +%s) builddate = $(date +%s)
+29
View File
@@ -0,0 +1,29 @@
#!/usr/bin/env bash
# Exercise the real packager and pacman's ordering rules on Arch Linux.
set -euo pipefail
here="$(cd "$(dirname "$0")" && pwd)"
work="$(mktemp -d)"
trap 'rm -rf "$work"' EXIT
for version in 0.1.0-rc.9 0.1.0-rc.10 0.1.0; do
pkgver="${version//-/}"
output="$work/tsunagi-${pkgver}-1-x86_64.pkg.tar.zst"
bash "$here/build-pkg.sh" /usr/bin/true x86_64 "$version" "$output"
bsdtar -xOf "$output" .PKGINFO > "$work/pkginfo"
grep -qx "pkgver = 1:${pkgver}-1" "$work/pkginfo"
grep -qx 'pkgname = tsunagi' "$work/pkginfo"
bsdtar -tf "$output" | grep -qx 'usr/bin/tsng'
done
test "$(vercmp 1:0.1.0rc.9-1 0.1.0_rc.99-1)" -gt 0
test "$(vercmp 1:0.1.0rc.10-1 1:0.1.0rc.9-1)" -gt 0
test "$(vercmp 1:0.1.0-1 1:0.1.0rc.10-1)" -gt 0
output="$work/tsunagi-gui-0.1.0rc.10-1-x86_64.pkg.tar.zst"
bash "$here/build-pkg.sh" /usr/bin/true x86_64 0.1.0-rc.10 "$output" /usr/bin/true
bsdtar -xOf "$output" .PKGINFO > "$work/pkginfo"
grep -qx 'pkgname = tsunagi-gui' "$work/pkginfo"
grep -qx 'pkgver = 1:0.1.0rc.10-1' "$work/pkginfo"
grep -qx 'conflict = tsunagi' "$work/pkginfo"
bsdtar -tf "$output" | grep -qx 'usr/bin/tsunagi-tray'
echo 'Arch packaging and version-order checks passed'
+1 -1
View File
@@ -34,7 +34,7 @@ let
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = if withTray then "tsunagi" else "tsunagi-cli"; pname = if withTray then "tsunagi" else "tsunagi-cli";
version = "0.1.0"; version = "1.0.0";
src = lib.cleanSource ../.; src = lib.cleanSource ../.;
cargoLock.lockFile = ../Cargo.lock; cargoLock.lockFile = ../Cargo.lock;