Skip to content

Commit 079d3c0

Browse files
committed
Merge branch 'pmd-analysis-cache' into develop
2 parents 26f3b61 + eee20de commit 079d3c0

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed

.github/workflows/check-build.yml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
timeout-minutes: 30
2929
strategy:
3030
matrix:
31-
java: [11, 17, 21]
31+
java: [17, 21]
3232
distribution: [temurin]
3333
steps:
3434
- uses: actions/checkout@v5
@@ -48,8 +48,7 @@ jobs:
4848
${{ runner.os }}-mvn-build-
4949
5050
- name: Build with Maven
51-
# Java 17 is required for tests
52-
run: ./mvnw -B clean package ${{ matrix.java >=17 && '-P run-integration-tests' || '-Dmaven.test.skip=true' }}
51+
run: ./mvnw -B clean package -P run-integration-tests
5352

5453
- name: Check for uncommited changes
5554
run: |
@@ -84,6 +83,31 @@ jobs:
8483
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/screenshots
8584
if-no-files-found: ignore
8685

86+
# Ensure compatibility with Java 11
87+
# See https://github.com/xdev-software/chartjs-java-model/issues/14
88+
build-java-11:
89+
runs-on: ubuntu-latest
90+
timeout-minutes: 30
91+
steps:
92+
- uses: actions/checkout@v5
93+
94+
- name: Set up JDK
95+
uses: actions/setup-java@v5
96+
with:
97+
distribution: temurin
98+
java-version: 11
99+
100+
- name: Cache Maven
101+
uses: actions/cache@v4
102+
with:
103+
path: ~/.m2/repository
104+
key: ${{ runner.os }}-mvn-build-java-11-${{ hashFiles('**/pom.xml') }}
105+
restore-keys: |
106+
${{ runner.os }}-mvn-build-java-11-
107+
108+
- name: Build with Maven
109+
run: ./mvnw -B clean package -Dmaven.test.skip=true
110+
87111
checkstyle:
88112
runs-on: ubuntu-latest
89113
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
key: ${{ runner.os }}-mvn-build-${{ hashFiles('**/pom.xml') }}
3535
restore-keys: |
3636
${{ runner.os }}-mvn-build-
37-
37+
3838
- name: Build with Maven
3939
run: ./mvnw -B clean package -T2C
4040

chartjs-java-model/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@
355355
<artifactId>maven-pmd-plugin</artifactId>
356356
<version>3.27.0</version>
357357
<configuration>
358+
<analysisCache>true</analysisCache>
358359
<includeTests>true</includeTests>
359360
<printFailingErrors>true</printFailingErrors>
360361
<rulesets>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<artifactId>maven-pmd-plugin</artifactId>
7373
<version>3.27.0</version>
7474
<configuration>
75+
<analysisCache>true</analysisCache>
7576
<includeTests>true</includeTests>
7677
<printFailingErrors>true</printFailingErrors>
7778
<rulesets>

0 commit comments

Comments
 (0)