Skip to content

Commit 284a9cd

Browse files
authored
refactor action, clean changelog
1 parent b5a0d7a commit 284a9cd

File tree

3 files changed

+68
-124
lines changed

3 files changed

+68
-124
lines changed

.github/workflows/release.yml

+46-40
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,41 @@ on:
88
jobs:
99
release:
1010
runs-on: ubuntu-latest
11-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
11+
if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
1212

1313
steps:
1414
- uses: actions/checkout@v3
1515
with:
1616
fetch-depth: 2
1717

18+
- name: Extract data from pom.xml
19+
id: pom-data
20+
uses: andreacomo/maven-gav-extractor@v2
21+
22+
- name: Get Changelog Entry based on pom.xml version
23+
id: changelog_for_pom_version
24+
uses: mindsers/changelog-reader-action@v2
25+
with:
26+
version: ${{ steps.pom-data.outputs.version }}
27+
validation_level: error
28+
validation_depth: 5
29+
30+
- name: check tag on version
31+
uses: mukunku/tag-exists-action@v1.1.0
32+
id: tag-for-pom-version
33+
with:
34+
tag: OpenKIM-${{ steps.pom-data.outputs.version }}
35+
env:
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
38+
- name: cancel action on tag exist
39+
if: steps.tag-for-pom-version.outputs.exists == 'true'
40+
run: |
41+
echo "::error::Tag for version ${{ steps.pom-data.outputs.version }} already exist."
42+
exit 1
43+
1844
- name: Set up JDK 17
19-
uses: actions/setup-java@v2
45+
uses: actions/setup-java@v3
2046
with:
2147
java-version: 17
2248
distribution: 'zulu'
@@ -28,55 +54,28 @@ jobs:
2854
git config --global user.name "Release Bot"
2955
git clone https://github.com/gematik/api-telematik.git
3056
31-
- name: Extract release notes
32-
id: extract-release-notes
33-
uses: ffurrer2/extract-release-notes@v1
34-
3557
- name: Build with Maven
3658
id: build_maven
3759
run: |
3860
mvn -B package --file pom.xml
39-
VERSION=$(mvn --non-recursive help:evaluate -Dexpression=project.version -q -DforceStdout | grep -v '\[.*')
40-
echo "::set-output name=version::$VERSION"
41-
42-
- uses: mukunku/tag-exists-action@v1.1.0
43-
id: checkTag
44-
with:
45-
tag: OpenKIM-${{ steps.build_maven.outputs.version }}
46-
env:
47-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
49-
- name: Publish new version
50-
if: steps.checkTag.outputs.exists == 'false'
51-
uses: svenstaro/upload-release-action@v2
52-
with:
53-
repo_name: sberg-net/openkim
54-
repo_token: ${{ secrets.GITHUB_TOKEN }}
55-
file: target/openkim-${{ steps.build_maven.outputs.version }}.jar
56-
tag: OpenKIM-${{ steps.build_maven.outputs.version }}
57-
overwrite: false
58-
body: ${{ steps.extract-release-notes.outputs.release_notes }}
5961
6062
- name: Docker meta
61-
if: steps.checkTag.outputs.exists == 'false'
6263
id: meta
63-
uses: docker/metadata-action@v3
64+
uses: docker/metadata-action@v5
6465
with:
6566
images: |
66-
sbergit/openkim
67+
${{ secrets.DOCKER_HUB_USER }}/openkim
6768
tags: |
6869
type=raw,value=latest
69-
type=match,pattern=[0-9]+.[0-9]+.[0-9]+,value=v${{ steps.build_maven.outputs.version }}
70-
#type=match,pattern=[0-9]+.[0-9]+,value=v${{ steps.build_maven.outputs.version }}
70+
type=match,pattern=[0-9]+.[0-9]+.[0-9]+,value=v${{ steps.pom-data.outputs.version }}
71+
#type=match,pattern=[0-9]+.[0-9]+,value=v${{ steps.pom-data.outputs.version }}
7172
#type=sha
7273
7374
- name: Set up Docker Buildx
74-
if: steps.checkTag.outputs.exists == 'false'
7575
id: buildx
76-
uses: docker/setup-buildx-action@v2
76+
uses: docker/setup-buildx-action@v3
7777

7878
- name: Inspect builder
79-
if: steps.checkTag.outputs.exists == 'false'
8079
run: |
8180
echo "Name: ${{ steps.buildx.outputs.name }}"
8281
echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}"
@@ -86,15 +85,13 @@ jobs:
8685
echo "Tags: ${{ steps.meta.outputs.tags }}"
8786
8887
- name: Login to DockerHub
89-
if: steps.checkTag.outputs.exists == 'false'
9088
uses: docker/login-action@v3
9189
with:
92-
username: sbergit
93-
password: ${{ secrets.DOCKER_HUB }}
90+
username: ${{ secrets.DOCKER_HUB_USER }}
91+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
9492

95-
- name: Build and push
96-
if: steps.checkTag.outputs.exists == 'false'
97-
uses: docker/build-push-action@v2
93+
- name: Build and push docker images
94+
uses: docker/build-push-action@v5
9895
with:
9996
context: .
10097
file: docker/Dockerfile
@@ -104,3 +101,12 @@ jobs:
104101
labels: ${{ steps.meta.outputs.labels }}
105102
cache-from: type=gha
106103
cache-to: type=gha,mode=max
104+
105+
- name: Publish new version
106+
uses: svenstaro/upload-release-action@v2
107+
with:
108+
repo_token: ${{ secrets.GITHUB_TOKEN }}
109+
file: target/openkim-${{ steps.pom-data.outputs.version }}.jar
110+
tag: OpenKIM-${{ steps.pom-data.outputs.version }}
111+
overwrite: false
112+
body: ${{ steps.changelog_for_pom_version.outputs.changes }}

CHANGELOG.md

+21-83
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,26 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased]
99

10-
## [0.18.2]
10+
### Added
11+
12+
### Changed
13+
14+
### Fixed
15+
16+
## [0.19.0]
1117

1218
### Added
1319

14-
- arm64 Docker Image
20+
- arm64 docker image to dockerHub
21+
22+
### Changed
23+
24+
- refactor release action
1525

1626
## [0.18.1]
1727

@@ -50,54 +60,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5060

5161
## [0.14.1]
5262

53-
### Added
54-
```
55-
```
56-
57-
### Changed
58-
```
59-
```
60-
6163
### Fixed
62-
```
64+
6365
- Pipeline-Operationen
64-
```
66+
6567

6668
## [0.14.0]
6769

6870
### Added
69-
```
71+
7072
- OpenKIM im Modus keine TI getestet
7173
- SMTP/POP3 - Protokoll des Gateways getestet
72-
```
7374

74-
### Changed
75-
```
76-
```
77-
78-
### Fixed
79-
```
80-
```
8175

8276
## [0.13.1]
8377

84-
### Added
85-
```
86-
```
87-
88-
### Changed
89-
```
90-
```
91-
9278
### Fixed
93-
```
79+
9480
- Pipeline-Struktur
95-
```
81+
9682

9783
## [0.13.0]
9884

9985
### Added
100-
```
86+
10187
- Hinzufügen einer Pipeline-Struktur für die Operationen (z.b. Signieren einer Mail)
10288
- bessere Test- und Erweiterbarkeit
10389
- besseres Handling der Komplexität
@@ -106,67 +92,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
10692
- Testen ohne Fachdienst-Servern, mit Konnektor und mit "handelsüblichen" Mailservern -> Checken, ob die Konnektor-Kommunikation funktioniert
10793
- Testen "Fullstack" -> mit Fachdienst-Servern und Konnektor
10894
- Weitere Umbauarbeiten
109-
```
110-
111-
### Changed
112-
```
113-
```
114-
115-
### Fixed
116-
```
117-
```
11895

11996
## [0.12.0]
12097

12198
### Added
122-
```
99+
123100
- Hinzufügen einer Pipeline-Struktur für die Operationen (z.b. Signieren einer Mail)
124101
- bessere Test- und Erweiterbarkeit
125-
```
126-
127-
### Changed
128-
```
129-
```
130-
131-
### Fixed
132-
```
133-
```
134102

135-
## [0.11.0]
136-
137-
### Added
138-
```
139-
```
140-
141-
### Changed
142-
```
143-
```
144-
145-
### Fixed
146-
```
147-
```
148103

149104
## [0.9.0]
150105

151106
### Added
152-
```
107+
153108
- Erstellen des Git-Repositorys
154109
- Github Actions
155110
- Dockerfile inklusive build und push zu [Dockerhub]
156-
```
157-
158-
### Changed
159-
```
160-
```
161-
162-
### Fixed
163-
```
164-
```
165-
166-
[unreleased]: https://github.com/sberg-net/openkim/compare/0.12.0...HEAD
167-
[0.12.0]: https://github.com/sberg-net/openkim/releases/tag/OpenKIM-0.12.0
168-
[0.11.0]: https://github.com/sberg-net/openkim/releases/tag/OpenKIM-0.11.0
169-
[0.10.0-dev1]: https://github.com/sberg-net/openkim/releases/tag/OpenKIM-0.10.0-dev1
170-
[0.9.1]: https://github.com/sberg-net/openkim/releases/tag/OpenKIM-0.9.1
171-
[0.9.0]: https://github.com/sberg-net/openkim/releases/tag/OpenKIM-0.9.0
172-
[dockerhub]: https://hub.docker.com/repository/docker/sbergit/openkim

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>net.sberg</groupId>
1212
<artifactId>openkim</artifactId>
13-
<version>0.18.2</version>
13+
<version>0.19.0</version>
1414
<name>openkim</name>
1515
<description>Open KIM Client Modul</description>
1616

0 commit comments

Comments
 (0)