Skip to content

Commit 5a2a594

Browse files
authored
Prepare release v1.6.0 (#182)
1 parent 310d15e commit 5a2a594

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.6.0] - 2025-03-17
11+
1012
### Added
1113

1214
- Support for multiple configurations (#69, #49).
1315
- Collections of known configurations are gathered in subdirectories of main/configs (#175).
1416
- Templated queries: variables shown in title of result table (#163).
1517
- Templated queries: changing variables dialogue is preloaded with previous values (#167).
16-
- About dialog, reachable from the application bar (#171).
18+
- An about dialog, reachable from the application bar (#171).
1719

1820
## [1.5.0] - 2025-01-02
1921

@@ -212,4 +214,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
212214
[1.4.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.0
213215
[1.4.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.1
214216
[1.5.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.5.0
215-
[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.5.0...HEAD
217+
[1.6.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.6.0
218+
[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.6.0...HEAD

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Table of contents:
2828
* [Additional prerequisites](#additional-prerequisites)
2929
* [Testing the production version](#testing-the-production-version)
3030
* [Testing the development version](#testing-the-development-version)
31-
* [Setting the version string](#setting-the-version-string)
31+
* [Maintaining the version string](#maintaining-the-version-string)
3232

3333
## Preface
3434

@@ -444,7 +444,6 @@ The procedure is the same as for testing the production version, except for step
444444
npm run dev-with-path
445445
```
446446

447-
### Setting the version string
447+
### Maintaining the version string
448448

449-
Before every merge to the main branch and before every release, set the version string [here](./main/src/version.js)
450-
according to the rules in that file.
449+
Maintain the version string [here](./main/src/version.js) according to the rules in that file.

main/src/version.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Set to a next intermediate version string vX.Y.Z-tttt when merging an unreleased version to the main branch.
2-
// 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).
3-
// ... All in accordance with https://semver.org/spec/v2.0.0.html.
4-
const version = "v1.6.0.0003";
1+
// Maintain the version string on the development branch:
2+
// - during development: set to (unreleased);
3+
// - 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).
4+
const version = "v1.6.0";
55
export default version;

0 commit comments

Comments
 (0)