From d417a2a95e175754ccb98e062a15885758a9820e Mon Sep 17 00:00:00 2001 From: Dawn Date: Wed, 19 Aug 2026 14:37:58 +0200 Subject: [PATCH] jfjoch_viewer: download versioned tarball from Gitea releases Fetch jfjoch_viewer-${V}-linux-cuda12.tgz from https://gitea.psi.ch/mx/Jungfraujoch/releases instead of requiring a hardcoded local tarball in the buildblock, so new versions only need a config.yaml entry. Co-Authored-By: Claude Fable 5 --- jfjoch_viewer/README.md | 2 +- jfjoch_viewer/build | 9 +++++++-- jfjoch_viewer/modulefile | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jfjoch_viewer/README.md b/jfjoch_viewer/README.md index 4fb3fbe..64d7770 100644 --- a/jfjoch_viewer/README.md +++ b/jfjoch_viewer/README.md @@ -9,7 +9,7 @@ module use unstable module load modbuild/2.1.3 ``` -Step 3: go into jfjoch_viewer directory, update config.yaml to add newest release version and build module with that release name +Step 3: go into jfjoch_viewer directory, update config.yaml to add the newest release version from https://gitea.psi.ch/mx/Jungfraujoch/releases and build the module with that release name -- the linux-cuda12 tarball is downloaded from the releases page automatically, no local tarball needed ``` cd jfjoch_viewer diff --git a/jfjoch_viewer/build b/jfjoch_viewer/build index 1c380e6..55e3bb6 100644 --- a/jfjoch_viewer/build +++ b/jfjoch_viewer/build @@ -8,7 +8,12 @@ pbuild::configure() { :; } pbuild::compile() { :; } pbuild::install() { - mkdir "${PREFIX}/bin" + # Release tag on gitea.psi.ch/mx/Jungfraujoch matches the module version, + # so the tarball is fetched per-version instead of shipped in the buildblock. + local -r tarball="jfjoch_viewer-${V}-linux-cuda12.tgz" + mkdir -p "${PREFIX}/bin" cd "${PREFIX}/bin" - tar -xvzf "${BUILDBLOCK_DIR}/jfjoch_viewer-1.0.0-rc.160-linux-cuda12.tgz" --strip-components=1 + curl -fLO "https://gitea.psi.ch/mx/Jungfraujoch/releases/download/${V}/${tarball}" + tar -xzf "${tarball}" --strip-components=1 + rm "${tarball}" } diff --git a/jfjoch_viewer/modulefile b/jfjoch_viewer/modulefile index 8d074e7..e05a182 100644 --- a/jfjoch_viewer/modulefile +++ b/jfjoch_viewer/modulefile @@ -1,7 +1,7 @@ #%Module module-whatis "jfjoch viewer trying install offline processing for mx beamlines" -module-url "https://gitea.psi.ch/mx/-/packages/rpm/jfjoch-viewer" +module-url "https://gitea.psi.ch/mx/Jungfraujoch/releases" module-license "for internal testing right now" module-maintainer "MX Data "