Skip to content

Commit d2fff61

Browse files
New release proces (to test)
1 parent 68f309b commit d2fff61

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

.github/workflows/release.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
echo "Git tag: $RELEASE_VERSION"
3636
echo "Pom version: $POM_VERSION"
3737
38-
if [ "$RELEASE_VERSION" != "$POM_VERSION" ]; then
38+
if [ "${RELEASE_VERSION-SNAPSHOT}" != "$POM_VERSION" ]; then
3939
echo "Error: Git tag ($RELEASE_VERSION) does not match pom.xml version ($POM_VERSION)"
4040
exit 1
4141
fi
@@ -46,6 +46,14 @@ jobs:
4646
git config --global user.name "GitHub Actions"
4747
git config --global user.email "[email protected]"
4848
49+
- name: Update pom.xml to release version
50+
run: |
51+
mvn versions:set -DnewVersion=${{ env.RELEASE_VERSION }} -B -q
52+
git commit -am "Set version to ${{ env.RELEASE_VERSION }}" || echo "No changes"
53+
git push origin HEAD:main
54+
env:
55+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56+
4957
- name: Extract release version
5058
run: |
5159
TAG_NAME=${GITHUB_REF_NAME}
@@ -62,3 +70,14 @@ jobs:
6270
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
6371
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
6472
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
73+
74+
- name: Bump to next patch snapshot
75+
run: |
76+
CURRENT=${{ env.RELEASE_VERSION }}
77+
IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT"
78+
NEXT_PATCH=$((PATCH+1))
79+
NEXT_VERSION="$MAJOR.$MINOR.$NEXT_PATCH-SNAPSHOT"
80+
echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
81+
mvn versions:set -DnewVersion=$NEXT_VERSION -B -q
82+
git commit -am "Set version to $NEXT_VERSION" || echo "No changes"
83+
git push origin HEAD:main

release_process.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
- Ensure `develop` branch is [Sonar-ready](https://sonarcloud.io/summary/new_code?id=ComputerDaddyGuy_JFileTreePrettyPrinter&branch=develop)
66

77
- **Merge `develop` into `main` branch**
8+
- Note: `pom.xml` must have `X.Y.Z-SNAPSHOT` version
89

910
- **In `main` branch:**
10-
- Update `pom.xml` to remove `-SNAPSHOT` version (keep only `X.Y.Z`)
1111
- Update `README.md` (with new `X.Y.Z` dependency version)
1212
- Update `CHANGELOG.md` with changes
1313
- Update `ROADMAP.md` if necessary
@@ -16,11 +16,9 @@
1616
- Push code & tags
1717

1818
- **In Github:**
19-
- Create new release based on tag: copy content of `CHANGELOG.md` for this version
19+
- Create new release based on `vX.Y.Z` tag: copy content of `CHANGELOG.md` for this version
2020
- Github `release` workflow will run automatically
2121
- Few minutes later, artifact is available on Maven Central 🎉
2222

2323
- **Merge `main` back into `develop` branch**
24-
25-
- **In `develop` branch:**
26-
- Update `pom.xml` to increment version and add `-SNAPSHOT` agin
24+
- Note: `pom.xml` now has `X.Y.(Z+1)-SNAPSHOT` version

0 commit comments

Comments
 (0)