Commit Graph
16 Commits
Author SHA1 Message Date
agw 14d790174b Stop shipping the build toolchain in the tarball
ModuleBundleBuildDir/LibraryR was being staged as ModuleLibrary/, 283 MB of
devtools, roxygen2, testthat, pkgdown, rcmdcheck and jaspModuleTools. That is
the toolchain that *builds* module bundles; JASP loads none of it at runtime.

I added it when I still believed the module directories were source trees
missing their library. Once that turned out to be wrong - the bundles carry
their own dependency closure, jaspTTests alone unpacks to 139
content-addressed package directories - the staging should have been removed
and was not.
2026-09-03 20:10:00 +02:00
agw 62ce2a60c7 Recover from interrupted R installs before building modules
The seven-module build stalled at 6/7 on all three passes, deterministically,
with a cause unrelated to jaspMixedModels itself:

  ERROR: failed to lock directory '.../LibraryR' for modifying
  Error in library("devtools") : there is no package called 'devtools'

R leaves 00LOCK-<pkg> directories behind when an install is interrupted and
then refuses to modify the library at all, and the interrupted install had
also taken devtools with it. Every one of my killed containers poisoned the
library for the runs after it.

Clear stale locks and reinstall whatever is missing before building, rather
than assuming a clean library. This matters for the pipeline too: a job that
times out or gets OOM-killed would otherwise leave the runner unable to
build until someone cleaned up by hand.
2026-09-02 22:40:00 +02:00
agw e49be3dfa4 Build only the modules JASP ships, not the developer helper's 22
Modules/modules-settings.json splits modules into 'common' - the seven
bundled with the application - and 'extra', which JASP fetches on demand
into ~/.local/share/JASP. buildAllDefaultJaspModules.R builds 22 regardless:
it is a developer convenience for having everything locally, not a
definition of what a release contains. I had been treating it as the latter.

The cost of that mistake was not just size. Most of the blockers this build
hit came from modules that are never shipped: gsl blocked jaspNetwork and
jaspBFF, OpenMx blocked jaspSem - all 'extra'. Building the right list drops
them entirely.

Measured: the seven common modules come to ~2.3 GB against ~8.3 GB for all
22. Bundles are already zstd-compressed, so the tarball does not shrink them
further; ~2.5-3 GB total is the realistic figure, against the Flatpak's
1.4 GB. The remaining gap is bundleAll=TRUE giving every module its own copy
of its R dependencies.

The guard now names the modules it expects and reports which are missing.
2026-09-02 22:15:00 +02:00
agw 74af81d2e5 Compile R packages with less parallelism: OpenMx was OOM-killed
The retry loop converged 6 -> 10 -> 10 bundles and stalled. The cause was
not a race after all:

  g++: fatal error: Killed signal terminated program cc1plus

OpenMx instantiates enough Eigen templates that a single cc1plus needs
several GB, and at -j5 on an 8GB runner the kernel killed it every time -
which is why both retries stopped at exactly 10/22 rather than creeping
forward. That in turn blocked jaspFactor, jaspSem, mxsem and semPlot.

R packages now compile at -j2 (R_JOBS) independently of the -j used for
the C++ build, and the runner VM was given 16GB.
2026-09-02 21:30:00 +02:00
agw e009dc82d3 Retry the module build, count the bundles, and stop bundling the loader
The later bump worked - the build reached staging. Three new problems:

- renv restores concurrently and not always in dependency order: forecast
  was lazy-loaded while vctrs was still compiling ('there is no package
  called vctrs', six lines before 'vctrs 0.7.3 built from source in 52s').
  That aborts the whole sapply() loop, so one race cost 20 modules. Retry
  the pass up to three times; renv skips what is installed, so each pass
  converges.

- The guard only required a non-empty Modules/local, so a build with 2 of
  22 modules passed it and went on to stage and package. It now requires
  the full expected count and lists what it did get.

- bundle-libs.sh crashed on the dynamic loader: ldd prints it as
  '/lib64/ld-linux-x86-64.so.2 => ...', so the first column is a path and
  the ld-linux* denylist entry never matched. Basename the soname before
  the check.
2026-09-02 20:45:00 +02:00
agw 0680e9cb0a Install remotes and bump the later pin so modules can build
Two more failures, both found by the guards added in the previous commit
rather than by shipping a broken package:

- install_github() has been deprecated since devtools 2.5.0 and now
  delegates to the 'remotes' package, which is no longer a hard dependency
  of devtools. jaspModuleTools could therefore never install, regardless of
  GitHub tokens - my earlier diagnosis of a rate limit was wrong. remotes is
  now pre-seeded into the library the script sets via .libPaths().

- later 1.4.6, pinned in every module renv.lock, bundles a tinycthread whose
  '#define once_flag pthread_once_t' collides with the C11 once_flag that
  glibc >= 2.43 declares under C23. Fixed upstream in later 1.4.7
  (r-lib/later#257); the 2026-04-22 RSPM snapshot the lockfiles already
  point at carries 1.4.8.

The lockfile patch is deliberately an explicit per-package list with a
recorded reason, not a blanket 'use latest' - silently changing the analysis
packages users get would be worse than a build failure.
2026-09-02 20:15:00 +02:00
agw 7dd99f0b7d Actually ship the R libraries the modules need
The first full build succeeded and produced a package that would not have
worked. Three separate causes, all silent:

- R was configured --with-blas --with-lapack, so it linked Arch's external
  BLAS and never built libRblas.so/libRlapack.so. The JASP module bundles
  expect those inside R_HOME, the way a conventional R and the Flatpak ship
  them. Now --without-blas, with a hard check after install.

- buildModuleBundlesLocally.R installs jaspModuleTools via install_github,
  which failed on anonymous GitHub rate limits. No bundles were produced at
  all. GITHUB_PAT is now required rather than merely recommended.

- buildAllDefaultJaspModules.R calls the bundle builder through system2(),
  which ignores exit status, so all of the above exited 0. Added explicit
  guards: jaspModuleTools must exist, Modules/local must be non-empty, and
  the staged tree must contain the bundles and all three R libraries.

Staging was also wrong: it copied ModuleBundleBuildDir/Modules, which is
cloned module *sources* with zero compiled objects, while dropping
LibraryR entirely - 267MB of R packages built against the bundled R.
2026-09-01 23:30:00 +02:00
agw 440cf8c475 Push HEAD:master to the AUR rather than a branch name
Cloning a package that does not exist on the AUR yet gives an empty repo
whose initial branch follows the runner's init.defaultBranch, which is not
guaranteed to be master. Verified against the real AUR remote: auth works,
the empty clone yields a .git, and 'git diff --staged --quiet' correctly
reports changes there - so the first publish commits instead of exiting
early with 'nothing to push'.
2026-09-01 23:05:00 +02:00
agw f3a6822744 Self-host tarballs on asger.weirsoe.dk instead of GitHub Releases
Serve from /srv/tarballz on CT148 via a 'location /tarballz/' alias, NOT
from under /var/www/asger: the asger-web deploy swaps that whole directory
atomically, so tarballs kept inside it would be deleted on the next site
deploy. CT148's rootfs was 3G with 2.7G free - one tarball would have
filled it - so it is grown to 15G; speedy's thin pool has room even though
vgs reports the VG nearly full.

Publishing uploads to a .part name and renames on arrival so a download can
never see a truncated file, verifies sha256 on the host, then fetches the
public URL and checks it against the sha256 baked into the PKGBUILD. Both
checks run before the AUR push, so the package cannot go out pointing at a
missing file. Old tarballs are pruned to the newest three.

GH_TOKEN is kept but demoted to an optional GITHUB_PAT for R module
downloads; it no longer has anything to do with publishing.
2026-09-01 22:50:00 +02:00
agw f0f317ca2f Document binary provenance in the PKGBUILD header
Checked what the AUR actually requires rather than relying on my earlier
assumption. The submission guidelines say only that packages using prebuilt
deliverables must carry the -bin suffix; nothing requires the binary to come
from upstream, so -bin is correct and sufficient here.

There is no formal 'unofficial binary' flag, so disclose it where users look:
an explicit PROVENANCE block in the PKGBUILD comment header naming the tag,
commit, build recipe and release URL, plus '(prebuilt binary)' in pkgdesc.

Corrects the README, which overstated the risk of a maintainer objecting.
2026-09-01 22:30:00 +02:00
agw 56434ba7ed Bundle non-system libraries instead of version-pinning depends
Bundling R alone was not enough: R links libicuuc, and Arch moves ICU
regularly. The obvious fix - pinning 'icu>=78 <79' in depends - is worse
than the disease on a rolling distro, because pacman would then refuse to
upgrade ICU while JASP is installed, blocking the user's whole system
upgrade until a rebuild lands.

So bundle-libs.sh copies every non-system shared library into
/opt/jasp-desktop/lib and rewrites rpaths, by denylist rather than
allowlist. depends now carries no version constraints at all.

Qt6 stays system-provided on purpose - Qt is binary compatible across Qt 6
minors, and bundling QtWebEngine would add ~500 MB. That also means the
only rebuild triggers left are a new JASP release and a Qt major bump;
rebuilding for anything else would cost users a 1.7 GB re-download.

Also fixes check-upstream.py querying only repo=Extra, which silently
returned nothing for icu (it lives in core).
2026-09-01 22:05:00 +02:00
agw 7b39a5b06e Fix R bundling: SIGPIPE abort and wrong R_HOME path
Two bugs found by the first real build:

- 'R --version | head -1' aborted the script with exit 141 under
  'set -o pipefail': head closes the pipe and R dies of SIGPIPE. Use
  'sed -n 1p', which consumes all input.
- R installed to lib64/R, not the lib/R the script assumed. Pin --libdir
  and ask 'R RHOME' for the real path instead of guessing.

Also stop exporting R_HOME. R.cmake warns that a set R_HOME makes R emit
'WARNING: ignoring environment value of R_HOME', which corrupts the output
cmake parses; CUSTOM_R_PATH is the supported way to select an R.
2026-09-01 21:55:00 +02:00
agw d880e6748c Bundle our own R 4.5.3 instead of building against Arch's R
Arch ships R 4.6.1, but JASP pins its R packages against a frozen CRAN
snapshot (2026-03-31 for 0.98.1) that targets R 4.5. Configuring against
Arch's R fails at Rcpp 1.1.1, which cannot compile on R 4.6 since
R_NamespaceRegistry was removed; the Rcpp release that fixes it is newer
than the pinned snapshot, so the lockfile cannot reach it either.

Build R 4.5.3 into /opt/jasp-desktop/R and point R_HOME at it, matching
what upstream CI does. This drops 'r' from depends entirely, so an Arch R
upgrade can no longer break an installed JASP, and the rebuild triggers
become Qt6 and ICU - the libraries actually still linked against.
2026-09-01 21:40:00 +02:00
agw 3ad88f9b0d Rename GITEA_TOKEN secret to STATE_PUSH_TOKEN
Gitea rejects secret names starting with the reserved GITEA_ prefix.
2026-09-01 21:20:00 +02:00
agw 92961bd7b3 Align AUR publishing with the existing pi3-smart-workspace pattern
Reuse the established conventions rather than inventing new ones: the
AUR_SSH_PRIVATE_KEY secret name, pushing from an archlinux:base-devel
job container instead of docker-in-docker, and the existing git identity.

The AUR job only needs the PKGBUILD, so the 1.5 GB tarball never crosses
a job boundary - it goes straight to GitHub Releases from the build job.

Also correct the Gitea job-timeout setting name to ENDLESS_TASK_TIMEOUT.
2026-09-01 21:10:00 +02:00
agw 0d4db32d5c Automated Arch binary builds of JASP for the AUR
Build JASP binary and publish to AUR / build (push) Failing after 12s
Build JASP binary and publish to AUR / check (push) Successful in 10s
Upstream JASP ships no Linux binary, so the existing AUR package builds
everything from source including several hundred R packages. This builds
that once in CI and publishes the result as jasp-desktop-bin.

JASP links against the system R and Qt6 rather than bundling them, so a
rebuild is triggered by an Arch r/qt6-base bump as well as by a new JASP
release, and the generated PKGBUILD pins depends to the versions actually
built against.
2026-09-01 20:30:00 +02:00