the agent prints the daemon's version, from the constant the packaging reads
The agent answered --version with "fingerprintd-agent 0.2.2", the string it was written with, while the daemon's constant went 0.2.3, 0.2.4, 0.2.5: the subpackage carried the package's version and reported another. The constant moves from main.cpp into the module both products import, with its note on what a bump publishes; the two scripts that derive pkgver from it, the APKBUILD's header and the CI comment name the new file. The APKBUILD's own pkgver stays a hand-kept copy, which a bump changes too.
This commit is contained in:
parent
bae21dc7a8
commit
51f476e596
7 changed files with 21 additions and 14 deletions
|
|
@ -4,7 +4,7 @@
|
|||
# Binary packaging: wraps a crafter-build binary cross-compiled per the
|
||||
# README's "Cross-compiling" section into a proper apk — used by this repo's
|
||||
# package CI (packaging/build-package.sh, which seds pkgver from
|
||||
# implementations/main.cpp) and runnable by hand. The source tarball is
|
||||
# interfaces/Fingerprintd.cppm) and runnable by hand. The source tarball is
|
||||
# produced by packaging/make-bin-tarball.sh. There is deliberately no
|
||||
# source-building aport: the build driver is crafter-build, which is not in
|
||||
# Alpine, so an APKBUILD that compiled from source could not be built by
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@ retry() { # retry <description> <cmd...>
|
|||
return 1
|
||||
}
|
||||
|
||||
# implementations/main.cpp is the version's single source of truth (same
|
||||
# interfaces/Fingerprintd.cppm is the version's single source of truth (same
|
||||
# derivation as make-bin-tarball.sh)
|
||||
VER=$(sed -n 's/.*char\* Version = "\(.*\)".*/\1/p' "$SRC/implementations/main.cpp")
|
||||
[ -n "$VER" ] || { echo "cannot read Version from implementations/main.cpp" >&2; exit 1; }
|
||||
VER=$(sed -n 's/.*Version = "\(.*\)".*/\1/p' "$SRC/interfaces/Fingerprintd.cppm")
|
||||
[ -n "$VER" ] || { echo "cannot read Version from interfaces/Fingerprintd.cppm" >&2; exit 1; }
|
||||
echo ">> packaging fingerprintd $VER"
|
||||
|
||||
# --- crafter-build: static launcher from the rolling release
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# root after a cross build; output lands in the current directory.
|
||||
set -eu
|
||||
|
||||
VER="${1:-$(sed -n 's/.*char\* Version = "\(.*\)".*/\1/p' implementations/main.cpp)}"
|
||||
VER="${1:-$(sed -n 's/.*Version = "\(.*\)".*/\1/p' interfaces/Fingerprintd.cppm)}"
|
||||
[ -n "$VER" ] || { echo "could not determine version — pass it as \$1" >&2; exit 1; }
|
||||
BIN=$(ls -t bin/fingerprintd-aarch64-*/fingerprintd 2>/dev/null | head -n1)
|
||||
[ -n "$BIN" ] || { echo "no aarch64 fingerprintd build found — cross-compile first" >&2; exit 1; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue