uses mvn:versions instead of jgitver
All checks were successful
CI / deploy (push) Successful in 4m46s
All checks were successful
CI / deploy (push) Successful in 4m46s
This commit is contained in:
parent
1544776ecc
commit
b977996689
18
.github/workflows/ci.yaml
vendored
18
.github/workflows/ci.yaml
vendored
@ -20,10 +20,14 @@ jobs:
|
|||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
|
|
||||||
- name: Build Runner
|
- name: new Version
|
||||||
|
if: github.ref_name == 'main'
|
||||||
run: |
|
run: |
|
||||||
./mvnw -B --no-transfer-progress clean validate -Prelease
|
./mvnw -B --no-transfer-progress clean validate -Prelease
|
||||||
./mvnw -B --no-transfer-progress versions:commit -Djgitver.skip=true
|
./mvnw -B --no-transfer-progress versions:commit -Djgitver.skip=true
|
||||||
|
|
||||||
|
- name: Build Runner
|
||||||
|
run: |
|
||||||
./mvnw -B --no-transfer-progress clean verify -Pnative -Dquarkus.native.remote-container-build=true -Djgitver.skip=true
|
./mvnw -B --no-transfer-progress clean verify -Pnative -Dquarkus.native.remote-container-build=true -Djgitver.skip=true
|
||||||
|
|
||||||
- name: Add coverage to PR
|
- name: Add coverage to PR
|
||||||
@ -37,7 +41,8 @@ jobs:
|
|||||||
title: ${{ env.REPO }} Coverage
|
title: ${{ env.REPO }} Coverage
|
||||||
|
|
||||||
- id: version
|
- id: version
|
||||||
run: echo "version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "GITHUB_OUTPUT"
|
name: Version
|
||||||
|
run: echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> ${GITHUB_OUTPUT}
|
||||||
|
|
||||||
- name: Build Container
|
- name: Build Container
|
||||||
if: github.ref_name == 'main'
|
if: github.ref_name == 'main'
|
||||||
@ -50,5 +55,10 @@ jobs:
|
|||||||
- name: create tag
|
- name: create tag
|
||||||
if: github.ref_name == 'main'
|
if: github.ref_name == 'main'
|
||||||
run: |
|
run: |
|
||||||
git tag ${{ steps.version.outputs.version }} -m "release ${{ steps.version.outputs.version }}"
|
git config user.email "ci@git.arindy.de"
|
||||||
git push origin ${{ steps.version.outputs.version }}
|
git config user.name "gitea"
|
||||||
|
git add ./pom.xml
|
||||||
|
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 }}
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
|
|
||||||
<extension>
|
|
||||||
<groupId>fr.brouillard.oss</groupId>
|
|
||||||
<artifactId>jgitver-maven-plugin</artifactId>
|
|
||||||
<version>1.9.0</version>
|
|
||||||
</extension>
|
|
||||||
</extensions>
|
|
@ -1,12 +0,0 @@
|
|||||||
<configuration xmlns="http://jgitver.github.io/maven/configuration/1.1.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://jgitver.github.io/maven/configuration/1.1.0 https://jgitver.github.io/maven/configuration/jgitver-configuration-v1_1_0.xsd">
|
|
||||||
<policy>MAX</policy>
|
|
||||||
<autoIncrementPatch>true</autoIncrementPatch>
|
|
||||||
<useCommitDistance>true</useCommitDistance>
|
|
||||||
<useDirty>false</useDirty>
|
|
||||||
<useGitCommitId>true</useGitCommitId>
|
|
||||||
<gitCommitIdLength>8</gitCommitIdLength>
|
|
||||||
<nonQualifierBranches>main</nonQualifierBranches>
|
|
||||||
<useDefaultBranchingPolicy>true</useDefaultBranchingPolicy>
|
|
||||||
</configuration>
|
|
15
pom.xml
15
pom.xml
@ -4,7 +4,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>de.arindy</groupId>
|
<groupId>de.arindy</groupId>
|
||||||
<artifactId>dice-tower</artifactId>
|
<artifactId>dice-tower</artifactId>
|
||||||
<version>0</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<compiler-plugin.version>3.13.0</compiler-plugin.version>
|
<compiler-plugin.version>3.13.0</compiler-plugin.version>
|
||||||
@ -284,17 +284,10 @@
|
|||||||
<version>3.0.0</version>
|
<version>3.0.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>regex-property</id>
|
<id>next-version</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>regex-property</goal>
|
<goal>parse-version</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
|
||||||
<name>tag.version</name>
|
|
||||||
<value>${jgitver.calculated_version}</value>
|
|
||||||
<regex>-SNAPSHOT</regex>
|
|
||||||
<replacement></replacement>
|
|
||||||
<failIfNoMatch>true</failIfNoMatch>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
@ -310,7 +303,7 @@
|
|||||||
<goal>set</goal>
|
<goal>set</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<newVersion>${tag.version}</newVersion>
|
<newVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}</newVersion>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user