diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fe244e..826149c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,34 @@ All notable changes to muSRFlow are recorded here. The project follows the release path documented in [`TODO.md`](TODO.md). +## 1.0.0-rc.6 (2026-10-29) + +### Linux release automation +- Gitea builds the ROOT/musrfit runtime from a pinned source revision, validates + its tools and manifest, and saves a reusable runtime artifact. +- Application and separate runtime RPM/AppImage packages are built together, + checked, archived, and published to the repository's Packages section. + An approved runtime run can be configured once in repository variables. +- Version-tag pushes validate the tag against `package.json`, publish packages + under the release version, and create a draft Gitea Release with download + links, SHA-256 checksums, and build provenance. Manual builds retain distinct + build-ID versions and do not create Release pages. +- Publication can be retried from the saved artifact without recompiling. + Identical existing files and verified repository links are retained; different + contents are never overwritten. Retries preserve the original tag identity + and existing release notes and publication status. +- Packaging tests no longer depend on Node or musrfit being installed at + particular host paths. Runtime packaging rejects incomplete or unloadable + tool bundles before producing installers. + +### Installation and documentation +- Linux provides a lean application plus a separate, validated offline runtime + bundle, with confirmed installation from Preferences. +- Installation guides distinguish user setup from developer builds and document + runtime source selection, Windows WSL prerequisites, and recovery steps. +- Windows packaging uses the muSRFlow icon. Windows builds remain a separate + process; this automated release produces Linux x86_64 packages only. + ## 1.0.0-rc.5 (2026-10-25) ### Desktop run downloads diff --git a/README.md b/README.md index 5742a84..a222278 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ muSRFlow makes fitting muSR spectra easier: create and edit MSR models, fit single runs or run series, inspect spectra, and plot fitted parameters. It is available as a desktop application and a web application. -Current release candidate: **1.0.0-rc.5**. +Current release candidate: **1.0.0-rc.6**. ## Installation diff --git a/docs/DESKTOP_DEPLOYMENT.md b/docs/DESKTOP_DEPLOYMENT.md index b7c0be2..4a159b1 100644 --- a/docs/DESKTOP_DEPLOYMENT.md +++ b/docs/DESKTOP_DEPLOYMENT.md @@ -7,7 +7,7 @@ This guide is for maintainers building installers and preparing releases. - [Linux installation and runtime selection](source/install-linux.rst) Application version comes from `package.json`; the current release candidate -is `1.0.0-rc.5`. Target PCs do not need the developer tools described below. +is `1.0.0-rc.6`. Target PCs do not need the developer tools described below. ## Build host diff --git a/docs/source/install-linux.rst b/docs/source/install-linux.rst index bbb6ffe..b943cca 100644 --- a/docs/source/install-linux.rst +++ b/docs/source/install-linux.rst @@ -9,7 +9,7 @@ runtime.** You can use an existing installation or install the separate runtime through Preferences. Node.js and npm are not needed on the target PC. The current application packages are for x86_64 Linux. Examples below use -``1.0.0-rc.5``; substitute the version of the package you obtained. Run the +``1.0.0-rc.6``; substitute the version of the package you obtained. Run the commands from the folder containing the downloaded files. Install the application @@ -24,7 +24,7 @@ On an RPM-based distribution with dnf: .. code-block:: bash - sudo dnf install ./musrflow-1.0.0-rc.5-x86_64.rpm + sudo dnf install ./musrflow-1.0.0-rc.6-x86_64.rpm musrflow On other RPM systems, use the distribution's package manager. The application @@ -35,8 +35,8 @@ AppImage .. code-block:: bash - chmod +x muSRFlow-1.0.0-rc.5-x86_64.AppImage - ./muSRFlow-1.0.0-rc.5-x86_64.AppImage + chmod +x muSRFlow-1.0.0-rc.6-x86_64.AppImage + ./muSRFlow-1.0.0-rc.6-x86_64.AppImage The application AppImage filename starts with ``muSRFlow``. It requires a compatible Linux desktop and AppImage/FUSE support. If it cannot start, @@ -75,7 +75,7 @@ Alternative: system runtime RPM .. code-block:: bash - sudo dnf install ./musrflow-runtime-1.0.0-rc.5-x86_64.rpm + sudo dnf install ./musrflow-runtime-1.0.0-rc.6-x86_64.rpm This installs the runtime into ``/opt/musrflow/runtime``, which muSRFlow recognizes automatically when no explicit tool directory takes precedence. @@ -87,8 +87,8 @@ For a user-writable runtime location: .. code-block:: bash - chmod +x musrflow-runtime-1.0.0-rc.5-x86_64.AppImage - ./musrflow-runtime-1.0.0-rc.5-x86_64.AppImage --install "$HOME/.local/share/musrflow/runtime" + chmod +x musrflow-runtime-1.0.0-rc.6-x86_64.AppImage + ./musrflow-runtime-1.0.0-rc.6-x86_64.AppImage --install "$HOME/.local/share/musrflow/runtime" Launch the application with the installed runtime selected: diff --git a/docs/source/install-windows.rst b/docs/source/install-windows.rst index 5b19c3d..c22401b 100644 --- a/docs/source/install-windows.rst +++ b/docs/source/install-windows.rst @@ -18,7 +18,8 @@ Before you start WSLg, which displays the musrview spectrum windows. * Administrator access is needed to enable the Windows virtualization features. * Obtain the Windows installer, named ``muSRFlow--x64.exe``. The - current release candidate is ``1.0.0-rc.5``. + verified Windows build described below is ``1.0.0-rc.5``. The rc.6 automated + release workflow produces Linux packages only, not a new Windows installer. **Use the refreshed Windows build.** Earlier rc.5 installers have the same filename but lack the WSL fixes. Obtain a build containing commit ``a6981c4`` diff --git a/package-lock.json b/package-lock.json index e31dc7e..0928bbd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "musrflow", - "version": "1.0.0-rc.5", + "version": "1.0.0-rc.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "musrflow", - "version": "1.0.0-rc.5", + "version": "1.0.0-rc.6", "license": "GPL-3.0-or-later", "dependencies": { "plotly.js-dist": "^3.5.1", diff --git a/package.json b/package.json index e8832db..c32b868 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "musrflow", "productName": "muSRFlow", - "version": "1.0.0-rc.5", + "version": "1.0.0-rc.6", "description": "A desktop and web workflow for musrfit", "main": "main.js", "scripts": { diff --git a/packaging/wsl2/README.md b/packaging/wsl2/README.md index e194031..6bba880 100644 --- a/packaging/wsl2/README.md +++ b/packaging/wsl2/README.md @@ -105,8 +105,9 @@ detects the bundled runtime and routes every tool through WSL. Build with: npm run dist:win ``` -The installer is written to `dist/muSRFlow--x64.exe` (currently -`muSRFlow-1.0.0-rc.5-x64.exe`). Build the rootfs first: `dist:win` packages the +The installer is written to `dist/muSRFlow--x64.exe`, using the version +in `package.json`. Windows installers are built separately; the automated +tag workflow currently produces Linux packages only. Build the rootfs first: `dist:win` packages the existing archive and does not regenerate it. The Windows installer still includes the runtime; the separate offline runtime installer in Preferences currently supports Linux only. diff --git a/tests/release-packaging.test.js b/tests/release-packaging.test.js index 7a81c04..0a87bda 100644 --- a/tests/release-packaging.test.js +++ b/tests/release-packaging.test.js @@ -10,7 +10,9 @@ const pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8')) const lock = JSON.parse(fs.readFileSync(path.join(root, 'package-lock.json'), 'utf8')); const main = fs.readFileSync(path.join(root, 'main.js'), 'utf8'); -assert.strictEqual(pkg.version, '1.0.0-rc.5'); +// Release numbers change; consistency matters, not a particular candidate. +assert.strictEqual(typeof pkg.version, 'string'); +assert(pkg.version.length > 0); assert.strictEqual(lock.version, pkg.version); assert.strictEqual(lock.packages[''].version, pkg.version); assert.strictEqual(pkg.build.appId, 'ch.psi.lmu.musrflow');