diff options
| author | user <user@clank> | 2026-09-02 15:26:52 +0200 |
|---|---|---|
| committer | user <user@clank> | 2026-09-02 15:26:52 +0200 |
| commit | 5dfb761d3060bff5be8623272fdaf0eeb27706ca (patch) | |
| tree | c553fbe5a3de0a10c6ffba8e8c685e1e1700af03 /contrib | |
| parent | release: v0.1.3 (diff) | |
| download | slosh-5dfb761d3060bff5be8623272fdaf0eeb27706ca.tar.gz slosh-5dfb761d3060bff5be8623272fdaf0eeb27706ca.tar.xz slosh-5dfb761d3060bff5be8623272fdaf0eeb27706ca.zip | |
arch-repo: find zig on PATH itself; release: v0.1.3 paperwork
ship calls arch-repo without the ZIG= prefix the by-hand runs had,
so the leg died on makepkg's dependency check mid-release. arch-repo
now derives ZIG from PATH when pacman has no zig, and exports it.
The formula and PKGBUILD pins ride along: ship's steps 6 and 7 had
already written them when the leg failed, and its preflight rightly
refuses a dirty tree.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/arch-repo | 7 | ||||
| -rw-r--r-- | contrib/arch/PKGBUILD | 4 | ||||
| -rw-r--r-- | contrib/homebrew/slosh.rb | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/contrib/arch-repo b/contrib/arch-repo index a7076f8..a78b50b 100755 --- a/contrib/arch-repo +++ b/contrib/arch-repo @@ -30,6 +30,13 @@ cd "$root" fail() { printf 'arch-repo: %s\n' "$*" >&2; exit 1; } command -v makepkg >/dev/null 2>&1 || fail "makepkg not found -- this runs on an Arch machine" +# The build needs zig, but not necessarily pacman's: a zig on PATH (the +# release box keeps it in ~/zig-<version>) serves, passed to the PKGBUILD as +# $ZIG. Exported, because makepkg is a child and a plain sh variable is not. +if [ ! -x /usr/bin/zig ] && [ -z "${ZIG:-}" ] && command -v zig >/dev/null 2>&1; then + ZIG="$(command -v zig)" +fi +export ZIG command -v repo-add >/dev/null 2>&1 || fail "repo-add not found (pacman ships it)" gpg --list-secret-keys "$KEY" >/dev/null 2>&1 \ || fail "no secret key $KEY in this keyring -- the repo is signed, and an diff --git a/contrib/arch/PKGBUILD b/contrib/arch/PKGBUILD index a7f168d..1cc2f81 100644 --- a/contrib/arch/PKGBUILD +++ b/contrib/arch/PKGBUILD @@ -14,7 +14,7 @@ # ZIG_GLOBAL_CACHE_DIR. pkgname=slosh -pkgver=0.1.2 +pkgver=0.1.3 pkgrel=1 pkgdesc="Terminal multiplexer: panes, tabs, and sessions you can detach from, on libghostty-vt" arch=('x86_64' 'aarch64') @@ -32,7 +32,7 @@ options=('!debug' '!strip') makedepends=('zig') # GitHub's tag archive extracts to $pkgname-$pkgver/ (the v is stripped). source=("$pkgname-v$pkgver.tar.gz::https://github.com/sl0p-foo/slosh/archive/refs/tags/v$pkgver.tar.gz") -sha256sums=('a524d0668f8e9f197c6e27db277400b1877f60e897e76bee5d34f6e59f996d87') +sha256sums=('f15f8d53dee46967339565228d0c87541770a9eda1e325756e92496764e849ff') # The Makefile's ZIG default is a developer-machine path; a builder has the # real one. Overridable so the package can be test-built where zig lives diff --git a/contrib/homebrew/slosh.rb b/contrib/homebrew/slosh.rb index 6f3978b..2a1000c 100644 --- a/contrib/homebrew/slosh.rb +++ b/contrib/homebrew/slosh.rb @@ -18,9 +18,9 @@ class Slosh < Formula # bytes, so the sha256 below stays honest. Pinned to a full commit id rather # than a branch, because a branch tarball changes under you and brew would # keep the stale one. - url "https://github.com/sl0p-foo/slosh/archive/5987a7f7adfcde60d7757ad858c7435fdaf479e0.tar.gz" - version "0.1.2" - sha256 "a5fc5ee33d8b6813a98b597f241e48d8d424c2f83bd93f30b4abbf1477573fb8" + url "https://github.com/sl0p-foo/slosh/archive/f2a9ff9b8b1f552fbae3bda9b0fc0be647cdc5eb.tar.gz" + version "0.1.3" + sha256 "2b997946069ed116664585623a707dc74d3c5b5915e7e7f1edf5b19baa2b5ca5" head "https://github.com/sl0p-foo/slosh.git", branch: "master" # zig is the whole toolchain: it compiles the C, builds the vendored |