Skip to content

Commit 2b81f77

Browse files
AB-xdevAB-xdev
authored
Merge pull request #615 from xdev-software/develop
Release
2 parents 44a6e6d + 446eb98 commit 2b81f77

File tree

25 files changed

+1187
-140
lines changed

25 files changed

+1187
-140
lines changed

‎.config/pmd/java/ruleset.xml‎

Lines changed: 858 additions & 5 deletions
Large diffs are not rendered by default.

‎.github/workflows/broken-links.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ jobs:
1313
runs-on: ubuntu-latest
1414
timeout-minutes: 15
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717

1818
- run: mv .github/.lycheeignore .lycheeignore
1919

2020
- name: Link Checker
2121
id: lychee
22-
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
22+
uses: lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2 # v2
2323
with:
2424
fail: false # Don't fail on broken links, create an issue instead
2525

2626
- name: Find already existing issue
2727
id: find-issue
2828
run: |
29-
echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title \"Link Checker Report\"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
29+
echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title "Link Checker Report"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
3030
env:
3131
GH_TOKEN: ${{ github.token }}
32-
32+
3333
- name: Close issue if everything is fine
3434
if: steps.lychee.outputs.exit_code == 0 && steps.find-issue.outputs.number != ''
3535
run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }}
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Create Issue From File
4040
if: steps.lychee.outputs.exit_code != 0
41-
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
41+
uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v6
4242
with:
4343
issue-number: ${{ steps.find-issue.outputs.number }}
4444
title: Link Checker Report

‎.github/workflows/check-build.yml‎

Lines changed: 53 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,27 @@ jobs:
2626
build:
2727
runs-on: ubuntu-latest
2828
timeout-minutes: 30
29-
3029
strategy:
3130
matrix:
32-
java: [17, 21]
31+
java: [17, 21, 25]
3332
distribution: [temurin]
34-
3533
steps:
36-
- uses: actions/checkout@v4
37-
34+
- uses: actions/checkout@v5
35+
3836
- name: Set up JDK
39-
uses: actions/setup-java@v4
37+
uses: actions/setup-java@v5
4038
with:
4139
distribution: ${{ matrix.distribution }}
4240
java-version: ${{ matrix.java }}
43-
cache: 'maven'
44-
41+
42+
- name: Cache Maven
43+
uses: actions/cache@v4
44+
with:
45+
path: ~/.m2/repository
46+
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
47+
restore-keys: |
48+
${{ runner.os }}-mvn-build-
49+
4550
- name: Cache Vaadin prod bundles
4651
uses: actions/cache@v4
4752
with:
@@ -50,10 +55,10 @@ jobs:
5055
key: ${{ runner.os }}-vaadin-prod-bundles-${{ hashFiles('**/pom.xml') }}
5156
restore-keys: |
5257
${{ runner.os }}-vaadin-prod-bundles-
53-
58+
5459
- name: Build with Maven
55-
run: ./mvnw -B clean package -Pproduction
56-
60+
run: ./mvnw -B clean package
61+
5762
- name: Check for uncommited changes
5863
run: |
5964
if [[ "$(git status --porcelain)" != "" ]]; then
@@ -83,21 +88,34 @@ jobs:
8388
runs-on: ubuntu-latest
8489
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
8590
timeout-minutes: 15
86-
8791
strategy:
8892
matrix:
8993
java: [17]
9094
distribution: [temurin]
91-
9295
steps:
93-
- uses: actions/checkout@v4
94-
96+
- uses: actions/checkout@v5
97+
9598
- name: Set up JDK
96-
uses: actions/setup-java@v4
99+
uses: actions/setup-java@v5
97100
with:
98101
distribution: ${{ matrix.distribution }}
99102
java-version: ${{ matrix.java }}
100-
cache: 'maven'
103+
104+
- name: Cache Maven
105+
uses: actions/cache@v4
106+
with:
107+
path: ~/.m2/repository
108+
key: ${{ runner.os }}-mvn-checkstyle-${{ hashFiles('**/pom.xml') }}
109+
restore-keys: |
110+
${{ runner.os }}-mvn-checkstyle-
111+
112+
- name: CheckStyle Cache
113+
uses: actions/cache@v4
114+
with:
115+
path: '**/target/checkstyle-cachefile'
116+
key: ${{ runner.os }}-checkstyle-${{ hashFiles('**/pom.xml') }}
117+
restore-keys: |
118+
${{ runner.os }}-checkstyle-
101119
102120
- name: Run Checkstyle
103121
run: ./mvnw -B checkstyle:check -P checkstyle -T2C
@@ -106,21 +124,34 @@ jobs:
106124
runs-on: ubuntu-latest
107125
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
108126
timeout-minutes: 15
109-
110127
strategy:
111128
matrix:
112129
java: [17]
113130
distribution: [temurin]
114-
115131
steps:
116-
- uses: actions/checkout@v4
132+
- uses: actions/checkout@v5
117133

118134
- name: Set up JDK
119-
uses: actions/setup-java@v4
135+
uses: actions/setup-java@v5
120136
with:
121137
distribution: ${{ matrix.distribution }}
122138
java-version: ${{ matrix.java }}
123-
cache: 'maven'
139+
140+
- name: Cache Maven
141+
uses: actions/cache@v4
142+
with:
143+
path: ~/.m2/repository
144+
key: ${{ runner.os }}-mvn-pmd-${{ hashFiles('**/pom.xml') }}
145+
restore-keys: |
146+
${{ runner.os }}-mvn-pmd-
147+
148+
- name: PMD Cache
149+
uses: actions/cache@v4
150+
with:
151+
path: '**/target/pmd/pmd.cache'
152+
key: ${{ runner.os }}-pmd-${{ hashFiles('**/pom.xml') }}
153+
restore-keys: |
154+
${{ runner.os }}-pmd-
124155
125156
- name: Run PMD
126157
run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -DskipTests -T2C

‎.github/workflows/no-response.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
permissions:
1414
issues: write
1515
steps:
16-
- uses: actions/stale@v9
16+
- uses: actions/stale@v10
1717
with:
1818
days-before-issue-stale: 7
1919
days-before-issue-close: 3

‎.github/workflows/release.yml‎

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,30 @@ permissions:
88
contents: write
99
pull-requests: write
1010

11+
# DO NOT RESTORE CACHE for critical release steps to prevent a (extremely unlikely) scenario
12+
# where a supply chain attack could be achieved due to poisoned cache
1113
jobs:
1214
check-code:
1315
runs-on: ubuntu-latest
1416
timeout-minutes: 30
1517
steps:
16-
- uses: actions/checkout@v4
17-
18+
- uses: actions/checkout@v5
19+
1820
- name: Set up JDK
19-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2022
with:
2123
java-version: '17'
2224
distribution: 'temurin'
23-
cache: 'maven'
24-
25+
26+
# Try to reuse existing cache from check-build
27+
- name: Try restore Maven Cache
28+
uses: actions/cache/restore@v4
29+
with:
30+
path: ~/.m2/repository
31+
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
32+
restore-keys: |
33+
${{ runner.os }}-mvn-build-
34+
2535
- name: Build with Maven
2636
run: ./mvnw -B clean package -Pproduction -T2C
2737

@@ -50,34 +60,34 @@ jobs:
5060
outputs:
5161
upload_url: ${{ steps.create-release.outputs.upload_url }}
5262
steps:
53-
- uses: actions/checkout@v4
54-
63+
- uses: actions/checkout@v5
64+
5565
- name: Configure Git
5666
run: |
5767
git config --global user.email "[email protected]"
5868
git config --global user.name "GitHub Actions"
59-
69+
6070
- name: Un-SNAP
6171
run: ./mvnw -B versions:set -DremoveSnapshot -DprocessAllModules -DgenerateBackupPoms=false
62-
72+
6373
- name: Get version
6474
id: version
6575
run: |
6676
version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
6777
echo "release=$version" >> $GITHUB_OUTPUT
6878
echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT
69-
79+
7080
- name: Commit and Push
7181
run: |
7282
git add -A
7383
git commit -m "Release ${{ steps.version.outputs.release }}"
7484
git push origin
7585
git tag v${{ steps.version.outputs.release }}
7686
git push origin --tags
77-
87+
7888
- name: Create Release
7989
id: create-release
80-
uses: shogo82148/actions-create-release@4661dc54f7b4b564074e9fbf73884d960de569a3 # v1
90+
uses: shogo82148/actions-create-release@7b89596097b26731bda0852f1504f813499079ee # v1
8191
with:
8292
tag_name: v${{ steps.version.outputs.release }}
8393
release_name: v${{ steps.version.outputs.release }}
@@ -117,16 +127,16 @@ jobs:
117127
needs: [prepare-release]
118128
timeout-minutes: 60
119129
steps:
120-
- uses: actions/checkout@v4
121-
130+
- uses: actions/checkout@v5
131+
122132
- name: Init Git and pull
123133
run: |
124134
git config --global user.email "[email protected]"
125135
git config --global user.name "GitHub Actions"
126136
git pull
127137
128138
- name: Set up JDK
129-
uses: actions/setup-java@v4
139+
uses: actions/setup-java@v5
130140
with: # running setup-java overwrites the settings.xml
131141
distribution: 'temurin'
132142
java-version: '17'
@@ -147,7 +157,7 @@ jobs:
147157
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
148158

149159
- name: Set up JDK
150-
uses: actions/setup-java@v4
160+
uses: actions/setup-java@v5
151161
with: # running setup-java again overwrites the settings.xml
152162
distribution: 'temurin'
153163
java-version: '17'
@@ -173,20 +183,28 @@ jobs:
173183
needs: [prepare-release]
174184
timeout-minutes: 15
175185
steps:
176-
- uses: actions/checkout@v4
177-
186+
- uses: actions/checkout@v5
187+
178188
- name: Init Git and pull
179189
run: |
180190
git config --global user.email "[email protected]"
181191
git config --global user.name "GitHub Actions"
182192
git pull
183193
184194
- name: Setup - Java
185-
uses: actions/setup-java@v4
195+
uses: actions/setup-java@v5
186196
with:
187197
java-version: '17'
188198
distribution: 'temurin'
189-
cache: 'maven'
199+
200+
# Try to reuse existing cache from check-build
201+
- name: Try restore Maven Cache
202+
uses: actions/cache/restore@v4
203+
with:
204+
path: ~/.m2/repository
205+
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
206+
restore-keys: |
207+
${{ runner.os }}-mvn-build-
190208
191209
- name: Build site
192210
run: ./mvnw -B compile site -DskipTests -T2C
@@ -197,6 +215,7 @@ jobs:
197215
for m in "${modules[@]}"
198216
do
199217
echo "$m/target/site -> ./target/site/$m"
218+
mkdir -p ./target/site/$m
200219
cp -r $m/target/site ./target/site/$m
201220
done
202221
@@ -212,8 +231,8 @@ jobs:
212231
needs: [publish-maven]
213232
timeout-minutes: 10
214233
steps:
215-
- uses: actions/checkout@v4
216-
234+
- uses: actions/checkout@v5
235+
217236
- name: Init Git and pull
218237
run: |
219238
git config --global user.email "[email protected]"
@@ -228,7 +247,7 @@ jobs:
228247
git add -A
229248
git commit -m "Preparing for next development iteration"
230249
git push origin
231-
250+
232251
- name: pull-request
233252
env:
234253
GH_TOKEN: ${{ github.token }}

‎.github/workflows/sync-labels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
timeout-minutes: 10
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
sparse-checkout: .github/labels.yml
2222

‎.github/workflows/test-deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 60
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Set up JDK
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with: # running setup-java overwrites the settings.xml
1919
distribution: 'temurin'
2020
java-version: '17'
@@ -33,9 +33,9 @@ jobs:
3333
env:
3434
PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
3535
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
36-
36+
3737
- name: Set up JDK
38-
uses: actions/setup-java@v4
38+
uses: actions/setup-java@v5
3939
with: # running setup-java again overwrites the settings.xml
4040
distribution: 'temurin'
4141
java-version: '17'

0 commit comments

Comments
 (0)