From e8da4a3e115ce6e4a8a08364b41a8df5ef6d3d04 Mon Sep 17 00:00:00 2001 From: roll Date: Mon, 30 Sep 2024 15:37:30 +0100 Subject: [PATCH] v1.1.0-rc.2 (#575) * Updated version to `v1.1.0-rc.1` * Updated version --- Makefile | 2 +- package.json | 2 +- portal/content/docs/contributing/development.md | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ed32032f1..978d069a5 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ release: git checkout main && git pull origin && git fetch -p @git log --pretty=format:"%C(yellow)%h%Creset %s%Cgreen%d" --reverse -20 @echo "\nReleasing v$(VERSION) in 10 seconds. Press to abort\n" && sleep 10 - make test && git commit -a -m 'v$(VERSION)' && git tag -a v$(VERSION) -m 'v$(VERSION)' + make test && git tag -a v$(VERSION) -m 'v$(VERSION)' git push --follow-tags --no-verify ## Runs the FastAPI server in isolation (:4040). diff --git a/package.json b/package.json index bb168726e..e7b8dfe3c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "opendataeditor", "license": "MIT", - "version": "1.0.0", + "version": "1.1.0-rc.2", "productName": "Open Data Editor", "author": "Open Knowledge Foundation", "description": "Data management for humans", diff --git a/portal/content/docs/contributing/development.md b/portal/content/docs/contributing/development.md index af71258f9..36378a37c 100644 --- a/portal/content/docs/contributing/development.md +++ b/portal/content/docs/contributing/development.md @@ -104,3 +104,11 @@ make docs ``` It will be automatically published on CloudFlare when merged to the `main` branch with previews available for pull requests. + +## Releasing + +> You need to be a maintainer to release a new version + +- Update the version in `package.json` according to SemVer +- Create a pull request with the changes and get it approved and merged +- Run `make release` locally to create a new release