Skip to content

Commit

Permalink
Merge pull request #30 from swisspost/develop
Browse files Browse the repository at this point in the history
Release PR
  • Loading branch information
MonsieurBon authored Feb 22, 2024
2 parents 7e64291 + b3e1847 commit c7d5192
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
- master

env:
RELEASE_VERSION: "0.4.23"
DEVELOP_VERSION: "0.4.24-SNAPSHOT"
RELEASE_VERSION: "0.4.24"
DEVELOP_VERSION: "0.4.25-SNAPSHOT"
GIT_AUTHOR_NAME: "@swisspost-devs"
GIT_AUTHOR_EMAIL: "oss@post.ch"
GIT_COMMITTER_NAME: "swisspost-devs"
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,8 @@ There is a complete [documentation](https://nidi3.github.io/apikana-java/site/pl

### Development
The development is done in the `develop` branch.
Releasing is done by defining the release and new development version in `release.sh` and by rebasing the develop branch onto the master branch.
[Travis CI](https://travis-ci.org) will then pick this up and perform the release.

### Release
Releasing is done by incrementing the new RELEASE and DEVELOP version in `publish.yml` and by merging the develop branch
into the master branch. [GitHub Actions](https://github.com/swisspost/apikana-java/actions) will then pick this up and
perform the release.

0 comments on commit c7d5192

Please sign in to comment.