diff --git a/Makefile b/Makefile index 2c1bea81eef8..24ba7190c0ef 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -MAJOR_VERSION = 2.9 -DEMO_BRANCH ?= prod-2-9 +MAJOR_VERSION = 2.10 +DEMO_BRANCH ?= prod-2-10 ANGULAR_VERSION := $(shell buildtools/get-version angular) diff --git a/SECURITY.md b/SECURITY.md index 14a9074a1d67..ea7cb777376b 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,3 +7,4 @@ | <= 2.6 | Unsupported | | 2.7 | 23/06/2026 | | 2.8 | 27/06/2027 | +| 2.9 | To be defined | diff --git a/docs/developer-guide.md b/docs/developer-guide.md index 2baa34167a69..550dc4f5b725 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -149,6 +149,8 @@ Update the `.github/workflows/main.yaml`: + MAIN_BRANCH: 'x.y' ``` +In the GitHub project settings deactivate the 'Status' Rule. + Commit and push the changes: ```bash @@ -157,6 +159,8 @@ git commit -m "Update the branch" git push origin x.y ``` +In the GitHub project settings reactivate the 'Status' Rule. + Back on master: ```bash @@ -194,22 +198,30 @@ Update the `SECURITY.md`: Note: when you do the release you should define date or the version x.y to now + 18 months for a standard release, and now + 36 months for an LTS release. -Update the `.github/workflows/audit.yaml`, in the branch matrix: +Create the label `backport x.y`. -```diff -+ - 'x.y+1' -``` +Commit and push the changes: -Create the label `backport x.y`. +```bash +NEXT_VERSION=x.y+1 +git add package.json Makefile SECURITY.md +git checkout -b "start-${NEXT_VERSION}" +git commit -m "Start the version ${NEXT_VERSION}" +git push origin "start-${NEXT_VERSION}" +``` -Protect the branch x.y. +Create a pull request from the new branch. -Commit and push the changes: +Login to transifex: ```bash -git add package.json Makefile SECURITY.md .github/workflows/audit.yaml -git commit -m "Start the version x.y+1" -git push origin master +echo "[https://www.transifex.com]" > ~/.transifexrc +echo "api_hostname = https://api.transifex.com" >> ~/.transifexrc +echo "rest_hostname = https://rest.api.transifex.com" >> ~/.transifexrc +echo "hostname = https://www.transifex.com" >> ~/.transifexrc +echo "username = $(gopass show gs/ci/transifex/rw/username)" >> ~/.transifexrc +echo "password = $(gopass show gs/ci/transifex/rw/password)" >> ~/.transifexrc +echo "token = $(gopass show gs/ci/transifex/rw/token)" >> ~/.transifexrc ``` Create the new localization resource: diff --git a/package-lock.json b/package-lock.json index 53317c5d5f33..d7856c145959 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ngeo", - "version": "2.9.0", + "version": "2.10.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ngeo", - "version": "2.9.0", + "version": "2.10.0", "license": "MIT", "dependencies": { "@fortawesome/fontawesome-free": "6.6.0", diff --git a/package.json b/package.json index 4d529b5d7101..d03d22f3e4a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngeo", - "version": "2.9.0", + "version": "2.10.0", "description": "AngularJS OpenLayers Library", "scripts": { "build-dll": "webpack --config=buildtools/webpack.config.dll.js --mode=production",