Skip to content

Commit 66750d0

Browse files
sven1103sven1103
authored
Merge branch 'main' into docs/linking-remote-data-ressources
2 parents bd64fd9 + 81fa755 commit 66750d0

29 files changed

Lines changed: 465 additions & 179 deletions

File tree

‎.github/workflows/build_package.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Build Maven Package
22

33
on:
44
pull_request:
5+
types:
6+
- ready_for_review
57
push:
68
branches:
79
- '**'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
push:
1616
branches: [ main, master, development, release/*, hotfix/* ]
1717
pull_request:
18+
types:
19+
- opened
20+
- ready_for_review
1821
# The branches below must be a subset of the branches above
1922
branches: [ main, master, development ]
2023
schedule:

‎.github/workflows/create-release.yml‎

Lines changed: 18 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ on:
88
required: true
99
permissions:
1010
id-token: write # This is required for requesting the JWT
11-
contents: read # This is required for actions/checkout
11+
contents: write # This is required for branch creation
12+
pull-requests: write # required for opening pull requests
1213
attestations: write # required for provenance
1314
jobs:
1415
release:
1516
runs-on: ubuntu-latest
1617
steps:
1718
- name: Checkout repository
18-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
20+
1921
- name: Set up JDK 21
2022
uses: actions/setup-java@v5
2123
with:
@@ -39,45 +41,16 @@ jobs:
3941
core.setSecret(token);
4042
console.log('OIDC token acquired. Length:', token.length);
4143
42-
- name: Set up git
43-
run: |
44-
git config --global user.email "support@qbic.zendesk.com"
45-
git config --global user.name "JohnnyQ5"
46-
4744
- name: Set version in Maven project
4845
run: mvn versions:set -DnewVersion=${{ github.event.inputs.versionTag }} -DprocessAllModules
4946

5047
- name: Build with Maven
51-
run: VAADIN_OFFLINE_KEY=${{ secrets.VAADIN_SERVER_23_2 }} mvn -B package -Pproduction -Dvaadin.force.production.build=true --file pom.xml
52-
53-
- name: Create Release Notes
54-
if: ${{ !startsWith(github.ref, 'refs/tags/')
55-
&& !( contains(github.event.inputs.versionTag, 'alpha')
56-
|| contains(github.event.inputs.versionTag, 'beta')
57-
|| contains(github.event.inputs.versionTag, 'rc')) }}
58-
uses: actions/github-script@v7
59-
with:
60-
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
61-
script: |
62-
await github.request(`POST /repos/${{ github.repository }}/releases`, {
63-
tag_name: "${{ github.event.inputs.versionTag }}",
64-
generate_release_notes: true
65-
});
48+
run: mvn -B package -Pproduction -Dvaadin.force.production.build=true --file pom.xml
6649

67-
- name: Create Pre-Release Notes
68-
if: ${{ !startsWith(github.ref, 'refs/tags/')
69-
&& ( contains(github.event.inputs.versionTag, 'alpha')
70-
|| contains(github.event.inputs.versionTag, 'beta')
71-
|| contains(github.event.inputs.versionTag, 'rc')) }}
72-
uses: actions/github-script@v7
73-
with:
74-
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
75-
script: |
76-
await github.request(`POST /repos/${{ github.repository }}/releases`, {
77-
tag_name: "${{ github.event.inputs.versionTag }}",
78-
generate_release_notes: true,
79-
prerelease: true
80-
});
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 }}
8154

8255
# Generate provenance (SLSA attestation) for all JARs
8356
- name: Generate SLSA build provenance
@@ -91,25 +64,21 @@ jobs:
9164
MAVEN_REPO_USERNAME: ${{ secrets.NEXUS_USERNAME }}
9265
MAVEN_REPO_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
9366

67+
- name: Configure Git Credentials
68+
run: |
69+
git config user.name github-actions
70+
git config user.email github-actions@github.com
71+
9472
- name: Switch to new branch
9573
run: git checkout -b release/set-version-to-${{ github.event.inputs.versionTag }}
9674

97-
- name: Set remote branch
98-
run: git push --set-upstream origin release/set-version-to-${{ github.event.inputs.versionTag }}
99-
10075
- name: Checkin commit
10176
run: git commit . -m 'Set version to ${{ github.event.inputs.versionTag }}'
10277

10378
- name: Push to Github
104-
run: git push
79+
run: git push --set-upstream origin release/set-version-to-${{ github.event.inputs.versionTag }}
10580

10681
- name: Open PR with version bump
107-
uses: actions/github-script@v7
108-
with:
109-
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
110-
script: |
111-
await github.request(`POST /repos/${{ github.repository }}/pulls`, {
112-
title: 'Update version to ${{ github.event.inputs.versionTag }}',
113-
head: 'release/set-version-to-${{ github.event.inputs.versionTag }}',
114-
base: 'main'
115-
});
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 }}"
83+
env:
84+
GH_TOKEN: ${{ github.token }}

‎.github/workflows/run_tests.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: Run Maven Tests
22

33
on:
44
pull_request:
5+
types:
6+
- opened
7+
- ready_for_review
58
push:
69
branches:
710
- '**'

‎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.11.0</version>
8+
<version>1.12.7</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.11.0</version>
8+
<version>1.12.7</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.11.0</version>
14+
<version>1.12.7</version>
1515
</parent>
1616

1717
<repositories>

‎datamanager-app/src/main/resources/application.properties‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,11 @@ spring.messages.basename=messages.error-messages, messages.toast-notifications,
224224
# you always have to escape single quotes by another single quote ' -> ''
225225
# https://www.mscharhag.com/java/resource-bundle-single-quote-escaping for reference
226226
spring.messages.always-use-message-format=true
227+
###############################################################################
228+
################### Raw Data Sync #############################################
229+
# Batch size for each remote sync query iteration.
230+
# Reduce (e.g. to 200) during large backlog re-syncs to lower database lock contention.
231+
qbic.sync.raw-data.batch-size=${SYNC_RAW_DATA_BATCH_SIZE:1000}
232+
# Maximum wall-clock duration in milliseconds for a single scheduled sync job execution.
233+
# Must remain smaller than the ShedLock lockAtMostFor value (currently PT40S = 40000ms).
234+
qbic.sync.raw-data.max-duration-ms=${SYNC_RAW_DATA_MAX_DURATION_MS:10000}

‎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.11.0</version>
8+
<version>1.12.7</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.11.0</version>
9+
<version>1.12.7</version>
1010
</parent>
1111

1212
<artifactId>domain-concept</artifactId>

0 commit comments

Comments
 (0)
⚡