Skip to content

Commit

Permalink
Start the version 2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Nov 8, 2024
1 parent 82cedd0 commit a2f3ab3
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
1 change: 1 addition & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
| <= 2.6 | Unsupported |
| 2.7 | 23/06/2026 |
| 2.8 | 27/06/2027 |
| 2.9 | To be defined |
32 changes: 22 additions & 10 deletions docs/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit a2f3ab3

Please sign in to comment.