diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1ad0e2d..b22c432 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: title: ${{ env.REPO }} Coverage - id: version - run: echo "version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "GITHUB_OUTPUT" + run: echo '::set-output VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)' - name: Build Container if: github.ref_name == 'main' @@ -50,5 +50,8 @@ jobs: - name: create tag if: github.ref_name == 'main' run: | + echo ${{ steps.version.outputs.VERSION }} + git commit -m "[no ci] release ${{ steps.version.outputs.version }}" git tag ${{ steps.version.outputs.version }} -m "release ${{ steps.version.outputs.version }}" + git push origin main git push origin ${{ steps.version.outputs.version }} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml deleted file mode 100644 index b909513..0000000 --- a/.mvn/extensions.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - fr.brouillard.oss - jgitver-maven-plugin - 1.9.0 - - diff --git a/.mvn/jgitver.config.xml b/.mvn/jgitver.config.xml deleted file mode 100644 index f3a988f..0000000 --- a/.mvn/jgitver.config.xml +++ /dev/null @@ -1,12 +0,0 @@ - - MAX - true - true - false - true - 8 - main - true - diff --git a/pom.xml b/pom.xml index 633dbe8..2f209de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.arindy dice-tower - 0 + 1.0.0-SNAPSHOT 3.13.0 @@ -284,17 +284,10 @@ 3.0.0 - regex-property + next-version - regex-property + parse-version - - tag.version - ${jgitver.calculated_version} - -SNAPSHOT - - true - @@ -310,7 +303,7 @@ set - ${tag.version} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}