Skip to content

Commit a271e36

Browse files
committed
Merge branch 'main' into development
2 parents be76deb + f3488a0 commit a271e36

22 files changed

Lines changed: 353 additions & 120 deletions

File tree

.github/workflows/create-release.yml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,18 @@ permissions:
1111
contents: write # This is required for branch creation
1212
pull-requests: write # required for opening pull requests
1313
attestations: write # required for provenance
14+
1415
jobs:
1516
release:
1617
runs-on: ubuntu-latest
1718
steps:
19+
- name: Validate version tag format
20+
run: |
21+
if ! echo "${{ github.event.inputs.versionTag }}" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
22+
echo "ERROR: versionTag must be a semantic version (e.g. 1.2.3 or 1.2.3-SNAPSHOT)"
23+
exit 1
24+
fi
25+
1826
- name: Checkout repository
1927
uses: actions/checkout@v6
2028

@@ -33,25 +41,12 @@ jobs:
3341
restore-keys: |
3442
${{ runner.os }}-maven-
3543
36-
- name: Debug OIDC (get a token)
37-
uses: actions/github-script@v7
38-
with:
39-
script: |
40-
const token = await core.getIDToken('sigstore'); // audience example
41-
core.setSecret(token);
42-
console.log('OIDC token acquired. Length:', token.length);
43-
4444
- name: Set version in Maven project
45-
run: mvn versions:set -DnewVersion=${{ github.event.inputs.versionTag }} -DprocessAllModules
45+
run: mvn versions:set -DnewVersion="${{ github.event.inputs.versionTag }}" -DprocessAllModules -DgenerateBackupPoms=false
4646

4747
- name: Build with Maven
4848
run: mvn -B package -Pproduction -Dvaadin.force.production.build=true --file pom.xml
4949

50-
- name: Create GitHub Release
51-
run: gh release create ${{ github.event.inputs.versionTag }} --generate-notes --fail-on-no-commits
52-
env:
53-
GH_TOKEN: ${{ github.token }}
54-
5550
# Generate provenance (SLSA attestation) for all JARs
5651
- name: Generate SLSA build provenance
5752
uses: actions/attest-build-provenance@v1
@@ -64,21 +59,28 @@ jobs:
6459
MAVEN_REPO_USERNAME: ${{ secrets.NEXUS_USERNAME }}
6560
MAVEN_REPO_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
6661

67-
- name: Configure Git Credentials
62+
- name: Configure Git Credentials for GithubActions
6863
run: |
69-
git config user.name github-actions
70-
git config user.email github-actions@github.com
64+
git config user.name "github-actions[bot]"
65+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
66+
env:
67+
GH_TOKEN: ${{ github.token }}
68+
69+
- name: Create GitHub Release
70+
run: gh release create "${{ github.event.inputs.versionTag }}" --generate-notes --fail-on-no-commits
71+
env:
72+
GH_TOKEN: ${{ github.token }}
7173

7274
- name: Switch to new branch
7375
run: git checkout -b release/set-version-to-${{ github.event.inputs.versionTag }}
7476

7577
- name: Checkin commit
76-
run: git commit . -m 'Set version to ${{ github.event.inputs.versionTag }}'
78+
run: git commit . -m 'Set version to "${{ github.event.inputs.versionTag }}"'
7779

7880
- name: Push to Github
7981
run: git push --set-upstream origin release/set-version-to-${{ github.event.inputs.versionTag }}
8082

8183
- name: Open PR with version bump
82-
run: gh pr create --base main --title "Update version to ${{ github.event.inputs.versionTag }}" --body "Updates the project version after a release to ${{ github.event.inputs.versionTag }}"
84+
run: gh pr create --base main --title "Update POM to released code in ${{ github.event.inputs.versionTag }}" --body "Records the version set during the release of ${{ github.event.inputs.versionTag }}."
8385
env:
8486
GH_TOKEN: ${{ github.token }}

.github/workflows/test-version-commit.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

application-commons/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>life.qbic.datamanager</groupId>
77
<artifactId>datamanager</artifactId>
8-
<version>1.12.7</version>
8+
<version>1.12.8</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>application-commons</artifactId>

broadcasting/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>life.qbic.datamanager</groupId>
77
<artifactId>datamanager</artifactId>
8-
<version>1.12.7</version>
8+
<version>1.12.8</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>broadcasting</artifactId>

datamanager-app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>life.qbic.datamanager</groupId>
1313
<artifactId>datamanager</artifactId>
14-
<version>1.12.7</version>
14+
<version>1.12.8</version>
1515
</parent>
1616

1717
<repositories>

datamanager-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>life.qbic.datamanager</groupId>
77
<artifactId>datamanager-bom</artifactId>
8-
<version>1.12.7</version>
8+
<version>1.12.8</version>
99
<packaging>pom</packaging>
1010
<name>DataManager BOM</name>
1111
<description>Bill of Materials for DataManager artifacts</description>

domain-concept/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic.datamanager</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.12.7</version>
9+
<version>1.12.8</version>
1010
</parent>
1111

1212
<artifactId>domain-concept</artifactId>

email-service-provider/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic.datamanager</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.12.7</version>
9+
<version>1.12.8</version>
1010
</parent>
1111

1212
<artifactId>email-service-provider</artifactId>

finances-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic.datamanager</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.12.7</version>
9+
<version>1.12.8</version>
1010
</parent>
1111

1212
<artifactId>finances-api</artifactId>

finances-infrastructure/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic.datamanager</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.12.7</version>
9+
<version>1.12.8</version>
1010
</parent>
1111

1212
<artifactId>finances-infrastructure</artifactId>
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>life.qbic.datamanager</groupId>
2222
<artifactId>finances</artifactId>
23-
<version>1.12.7</version>
23+
<version>1.12.8</version>
2424
<scope>compile</scope>
2525
</dependency>
2626
<dependency>

0 commit comments

Comments
 (0)