From c1db51facaa34b9f66606aed3b99416b6c6c6781 Mon Sep 17 00:00:00 2001 From: Martin Vanbrabant Date: Mon, 17 Mar 2025 10:29:23 +0100 Subject: [PATCH] Prepare release v1.6.0 --- CHANGELOG.md | 7 +++++-- README.md | 7 +++---- main/src/version.js | 8 ++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8779709d..abc607cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,13 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.6.0] - 2025-03-17 + ### Added - Support for multiple configurations (#69, #49). - Collections of known configurations are gathered in subdirectories of main/configs (#175). - Templated queries: variables shown in title of result table (#163). - Templated queries: changing variables dialogue is preloaded with previous values (#167). -- About dialog, reachable from the application bar (#171). +- An about dialog, reachable from the application bar (#171). ## [1.5.0] - 2025-01-02 @@ -212,4 +214,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [1.4.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.0 [1.4.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.1 [1.5.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.5.0 -[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.5.0...HEAD +[1.6.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.6.0 +[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.6.0...HEAD diff --git a/README.md b/README.md index c2b74e3c..cba790ec 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Table of contents: * [Additional prerequisites](#additional-prerequisites) * [Testing the production version](#testing-the-production-version) * [Testing the development version](#testing-the-development-version) - * [Setting the version string](#setting-the-version-string) + * [Maintaining the version string](#maintaining-the-version-string) ## Preface @@ -444,7 +444,6 @@ The procedure is the same as for testing the production version, except for step npm run dev-with-path ``` -### Setting the version string +### Maintaining the version string -Before every merge to the main branch and before every release, set the version string [here](./main/src/version.js) -according to the rules in that file. +Maintain the version string [here](./main/src/version.js) according to the rules in that file. diff --git a/main/src/version.js b/main/src/version.js index 0d5f679a..0e3151f6 100644 --- a/main/src/version.js +++ b/main/src/version.js @@ -1,5 +1,5 @@ -// Set to a next intermediate version string vX.Y.Z-tttt when merging an unreleased version to the main branch. -// Set to the new release version string vX.Y.Z right before make a new release tag vX.Y.Z (see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/tags). -// ... All in accordance with https://semver.org/spec/v2.0.0.html. -const version = "v1.6.0.0003"; +// Maintain the version string on the development branch: +// - during development: set to (unreleased); +// - right before merging to the main branch for making a new release: set to the new release tag (see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/tags). +const version = "v1.6.0"; export default version;