Skip to content

Commit 5435014

Browse files
committed
ci: update workflows and remove leading v from release tag
1 parent 6f9a30e commit 5435014

File tree

3 files changed

+31
-16
lines changed

3 files changed

+31
-16
lines changed
Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1-
name: Maven release next version
1+
name: Maven release
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
version-core:
7+
description: 'Major, Minor or Patch release'
8+
type: choice
9+
required: true
10+
default: 'minor'
11+
options:
12+
- "major"
13+
- "minor"
14+
- "patch"
515

616
jobs:
717
build:
818
runs-on: ubuntu-latest
919
steps:
1020
- uses: actions/checkout@master
21+
1122
- name: Import Secrets
1223
uses: hashicorp/[email protected]
1324
with:
@@ -17,27 +28,30 @@ jobs:
1728
secrets: |
1829
ci/data/gh-workflows/maven-danubetech-nexus username | MAVEN_USERNAME ;
1930
ci/data/gh-workflows/maven-danubetech-nexus password | MAVEN_PASSWORD ;
20-
ci/data/gh-workflows/maven-release-workflow token | TOKEN ;
21-
ci/data/gh-workflows/deployment-status slack-webhook-url | SLACK_WEBHOOK_URL
31+
ci/data/gh-workflows/maven-release-workflow token | TOKEN
32+
2233
- name: Release to Danubetech Nexus
23-
uses: qcastel/github-actions-maven-release@v1.12.25
34+
uses: BernhardFuchs/docker-maven-release@use-dynamic-input
2435
with:
2536
release-branch-name: main
2637
maven-repo-server-id: danubetech-maven-releases
2738
maven-repo-server-username: ${{ env.MAVEN_USERNAME }}
2839
maven-repo-server-password: ${{ env.MAVEN_PASSWORD }}
2940
access-token: ${{ env.TOKEN }}
30-
version-minor: true
31-
maven-development-version-number: ${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}-SNAPSHOT
32-
maven-release-version-number: ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.0
41+
version-core: ${{ github.event.inputs.version-core }}
42+
maven-development-version-format-minor: ${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}-SNAPSHOT
43+
maven-development-version-format-major: ${parsedVersion.nextMajorVersion}.1-SNAPSHOT
44+
maven-release-version-format-minor: ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.0
45+
maven-release-version-format-major: ${parsedVersion.nextMajorVersion}.0.0
3346
git-release-bot-name: "admin-bot"
3447
git-release-bot-email: "[email protected]"
35-
maven-args: "-Dmaven.javadoc.skip=true -DskipTests -DskipITs"
48+
maven-args: "-Dmaven.javadoc.skip=true -DskipITs"
49+
3650
- name: Slack notification
51+
if: failure()
3752
uses: 8398a7/action-slack@v3
3853
with:
3954
status: ${{ job.status }}
4055
fields: repo,commit,action,eventName,ref,workflow
4156
env:
42-
SLACK_WEBHOOK_URL: ${{ env.SLACK_WEBHOOK_URL }}
43-
if: failure()
57+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/maven-deploy-snapshot.yml renamed to .github/workflows/maven-snapshot.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Maven deploy snapshot to Danubetech Nexus
1+
name: Maven snapshot
22

33
on:
44
push:
@@ -23,20 +23,21 @@ jobs:
2323
caCertificate: ${{ secrets.VAULTCA }}
2424
secrets: |
2525
ci/data/gh-workflows/maven-danubetech-nexus username | MAVEN_USERNAME ;
26-
ci/data/gh-workflows/maven-danubetech-nexus password | MAVEN_PASSWORD ;
27-
ci/data/gh-workflows/deployment-status slack-webhook-url | SLACK_WEBHOOK_URL
26+
ci/data/gh-workflows/maven-danubetech-nexus password | MAVEN_PASSWORD
27+
2828
- name: Run maven deploy action
2929
uses: danubetech/github-action-maven-deploy@master
3030
with:
3131
server_id: danubetech-maven-snapshots
3232
env:
3333
MAVEN_USERNAME: ${{ env.MAVEN_USERNAME }}
3434
MAVEN_PASSWORD: ${{ env.MAVEN_PASSWORD }}
35+
3536
- name: Slack notification
37+
if: failure()
3638
uses: 8398a7/action-slack@v3
3739
with:
3840
status: ${{ job.status }}
3941
fields: repo,commit,action,eventName,ref,workflow
4042
env:
41-
SLACK_WEBHOOK_URL: ${{ env.SLACK_WEBHOOK_URL }}
42-
if: failure()
43+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<version>${maven-release-plugin.version}</version>
101101
<configuration>
102102
<scmCommentPrefix>[skip ci]</scmCommentPrefix>
103-
<tagNameFormat>v@{project.version}</tagNameFormat>
103+
<tagNameFormat>@{project.version}</tagNameFormat>
104104
</configuration>
105105
</plugin>
106106
</plugins>

0 commit comments

Comments
 (0)