Catcrafts/catcrafts.net
Watch
2
0
Fork
You've already forked catcrafts.net
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci fix
All checks were successful
Deploy / build-deploy (push) Successful in 5m31s
Details

Browse source
This commit is contained in:
Jorijn van der Graaf 2026-08-05 05:50:01 +02:00
commit 40e094f7eb
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.forgejo/workflows/deploy.yaml
View file

@ -295,9 +295,9 @@ jobs:
rsync -a --delete content/ /deploy-app/content/ rsync -a --delete content/ /deploy-app/content/
# The server links libmsquic as a SHARED lib out of crafter-build's # The server links libmsquic as a SHARED lib out of crafter-build's
# external cache; the RUNPATH into that cache only exists on this # external cache; the RUNPATH into that cache only exists on this
# build machine. The binary carries an $ORIGIN rpath (project.cpp), # build machine. The binary carries an rpath to /srv/catcrafts-app
# so the .so must travel with it. install dereferences the # (project.cpp), so the .so must travel with it. install dereferences
# libmsquic.so.2 -> .so.2.x.y symlink into a regular file. # the libmsquic.so.2 -> .so.2.x.y symlink into a regular file.
MSQ=$(find ~/.cache/crafter.build/external -name 'libmsquic.so.2*' -type f | head -1) MSQ=$(find ~/.cache/crafter.build/external -name 'libmsquic.so.2*' -type f | head -1)
if [ -z "$MSQ" ]; then if [ -z "$MSQ" ]; then
echo "ERROR: libmsquic.so.2 not found in the external build cache." >&2 echo "ERROR: libmsquic.so.2 not found in the external build cache." >&2

10
project.cpp
View file

@ -137,9 +137,13 @@ extern "C" Configuration CrafterBuildProject(std::span<const std::string_view> a
// libmsquic.so.2 is built in crafter-build's external cache, and the // libmsquic.so.2 is built in crafter-build's external cache, and the
// RUNPATH pointing there only exists on the build machine — the first // RUNPATH pointing there only exists on the build machine — the first
// deploy to a real host died in the loader (exit 127) because of it. // deploy to a real host died in the loader (exit 127) because of it.
// $ORIGIN makes the loader also look next to the binary itself, and CI // CI ships the .so alongside the binary into /srv/catcrafts-app, and
// ships the .so alongside it into /srv/catcrafts-app. // this rpath makes the loader look there. The path is spelled out
cfg.linkFlags.push_back("-Wl,-rpath,$ORIGIN"); // rather than $ORIGIN: the flag passes through a shell on its way to
// the linker, where $ORIGIN expands to empty — leaving a bare -rpath
// that swallows the next input file (libCatcrafts.Shared.a) and fails
// the link with every Shared symbol undefined.
cfg.linkFlags.push_back("-Wl,-rpath,/srv/catcrafts-app");
ApplyReleaseTrimming(cfg); ApplyReleaseTrimming(cfg);
return cfg; return cfg;