sami7777/triangles_v5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(build): verify-reproducible-build auto-builds libtor + libi2pd

Browse Source 
The script previously assumed libtor.a and libi2pd*.a were already
present, but on a fresh checkout they only exist after running
src/tor/build-libtor.sh and src/i2p/build-libi2pd.sh. CI does this
in build-all.yml but local verification didn't, which bit me during
the v6.1.5 release.

Detect missing static libs and invoke the build scripts (passing
/usr paths for native Linux, matching what CI does). On a fresh
checkout this adds ~8 min to first-run verification; subsequent
runs skip the build step.

Logs go to /tmp/triangles-build-lib{tor,i2pd}.log for debugging.
Exit code 5 distinguishes build-prep failures from cmake/build
failures (3) and binary-compare failures (1/4).
This commit is contained in:
Sami Ahmed
2026-07-08 00:18:07 -07:00
parent e63da1d730
commit 3e20a1df6e
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/verify-reproducible-build.sh
+33
View File
@@ -68,6 +68,39 @@ if [ -n "$(cd "$SOURCE_DIR" && git status --porcelain --untracked-files=no 2>/de
echo " match a clean checkout/tag. Commit or stash tracked changes first." >&2
fi
# ── Embedded sub-libraries (Tor, I2P) ─────────────────────────────────────
# The daemon statically links libtor.a and libi2pd*.a; both must exist
# before cmake's link step. On a fresh checkout they need to be built from
# the embedded submodules. CI does this in build-all.yml before the main
# build; this script does the same so a local `scripts/verify-reproducible-build.sh`
# works out of the box.
TOR_LIB="$SOURCE_DIR/src/tor/tor-src/libtor.a"
I2P_LIBS=(
"$SOURCE_DIR/src/i2p/i2pd-src/libi2pd.a"
"$SOURCE_DIR/src/i2p/i2pd-src/libi2pdclient.a"
"$SOURCE_DIR/src/i2p/i2pd-src/libi2pdlang.a"
)
NEED_TOR_BUILD=0
NEED_I2P_BUILD=0
[ -f "$TOR_LIB" ] || NEED_TOR_BUILD=1
for lib in "${I2P_LIBS[@]}"; do [ -f "$lib" ] || NEED_I2P_BUILD=1; done
if [ "$NEED_TOR_BUILD" = "1" ]; then
echo "Building libtor.a (one-time, ~5 min)..." >&2
# CI passes /usr paths for native Linux; defaults in build-libtor.sh
# are MINGW64 cross-compile paths.
LIBEVENT_DIR=/usr OPENSSL_DIR=/usr ZLIB_DIR=/usr \
bash "$SOURCE_DIR/src/tor/build-libtor.sh" \
> /tmp/triangles-build-libtor.log 2>&1 \
|| { echo "ERROR: libtor build failed; see /tmp/triangles-build-libtor.log" >&2; exit 5; }
fi
if [ "$NEED_I2P_BUILD" = "1" ]; then
echo "Building libi2pd*.a (one-time, ~3 min)..." >&2
bash "$SOURCE_DIR/src/i2p/build-libi2pd.sh" \
> /tmp/triangles-build-libi2pd.log 2>&1 \
|| { echo "ERROR: libi2pd build failed; see /tmp/triangles-build-libi2pd.log" >&2; exit 5; }
fi
# ── Helpers ────────────────────────────────────────────────────────────────
build_one() {
local dir="$1" log="$2"