Skip to content

Commit 825a2bf

Browse files
authored
Merge branch 'development' into chore/migrate-facility-location
2 parents eba66b6 + 802026f commit 825a2bf

4 files changed

Lines changed: 15 additions & 11 deletions

File tree

‎.github/workflows/pull_request_gradle.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ on:
1919
jobs:
2020
build:
2121
concurrency:
22-
group: pull_request_gradle-${{ github.event_name }}-${{ github.head_ref }}-${{ matrix.module }}
22+
group: pull_request_gradle-${{ github.event_name }}-${{ github.head_ref }}-${{ matrix.module }}-${{ matrix.java-version }}
2323
cancel-in-progress: true
2424
runs-on: ubuntu-latest
2525
strategy:
26+
fail-fast: false # A broken JDK must not cancel the others.
2627
matrix:
2728
module: ['getting-started/hello-world', 'use-cases/school-timetabling', 'getting-started/spring-boot-integration']
28-
java-version: [ 21 ] # Only the first supported LTS; already too many jobs here.
29+
# Compile target, current LTS and latest JDK; replace 27 on each JDK release.
30+
java-version: [ 21, 25, 27 ]
2931
timeout-minutes: 120
3032
steps:
3133
- name: Checkout timefold-quickstarts

‎.github/workflows/pull_request_maven.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,15 @@ jobs:
2323
cancel-in-progress: true
2424
runs-on: ${{matrix.os}}
2525
strategy:
26+
fail-fast: false # A broken JDK must not cancel the others.
2627
matrix:
2728
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macOS-latest]
28-
java-version: [ 21, 25 ] #Latest two LTS + latest non-LTS.
29+
java-version: [ 25, 27 ] # Current LTS and latest JDK; replace 27 on each JDK release.
30+
include: # Compile target and minimum runtime; Linux only.
31+
- os: ubuntu-latest
32+
java-version: 21
33+
- os: ubuntu-24.04-arm
34+
java-version: 21
2935
timeout-minutes: 120
3036
steps:
3137
- name: Support long paths

‎.github/workflows/pull_request_maven_long_running.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
cancel-in-progress: true
5555
runs-on: ${{ matrix.os }}
5656
strategy:
57+
fail-fast: false # A broken JDK or module must not cancel the others.
5758
matrix:
5859
os: [ ubuntu-latest, ubuntu-24.04-arm ]
5960
module: [
@@ -64,9 +65,7 @@ jobs:
6465
"use-cases/sports-league-scheduling", "use-cases/task-assigning",
6566
"use-cases/tournament-scheduling", "use-cases/vehicle-routing"
6667
]
67-
# Only one supported LTS; already too many jobs here.
68-
# We choose 25 as that's the latest LTS.
69-
java-version: [ 25 ]
68+
java-version: [ 25 ] # The compile target is covered by the Maven workflow.
7069
timeout-minutes: 120
7170
steps:
7271
- name: Checkout timefold-quickstarts
@@ -98,7 +97,6 @@ jobs:
9897
with:
9998
java-version: ${{matrix.java-version}}
10099
distribution: 'graalvm-community'
101-
components: 'native-image'
102100
github-token: ${{ secrets.GITHUB_TOKEN }}
103101
cache: 'maven'
104102

@@ -119,12 +117,11 @@ jobs:
119117
cancel-in-progress: true
120118
runs-on: ubuntu-latest
121119
strategy:
120+
fail-fast: false # A broken JDK must not cancel the others.
122121
matrix:
123122
module: [
124123
"getting-started/spring-boot-integration"
125124
]
126-
# Only one supported LTS; already too many jobs here.
127-
# We choose 25 as that's the latest LTS.
128125
java-version: [ 25 ]
129126
timeout-minutes: 120
130127
steps:
@@ -157,7 +154,6 @@ jobs:
157154
with:
158155
java-version: ${{matrix.java-version}}
159156
distribution: 'graalvm-community'
160-
components: 'native-image'
161157
github-token: ${{ secrets.GITHUB_TOKEN }}
162158
cache: 'maven'
163159

‎getting-started/hello-world/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<version.ai.timefold.solver>999-SNAPSHOT</version.ai.timefold.solver>
1616
<version.org.assertj>3.27.7</version.org.assertj>
1717
<version.org.junit.jupiter>6.1.3</version.org.junit.jupiter>
18-
<version.ch.qos.logback>1.6.3</version.ch.qos.logback>
18+
<version.ch.qos.logback>1.6.4</version.ch.qos.logback>
1919

2020
<version.compiler.plugin>3.16.0</version.compiler.plugin>
2121
<version.surefire.plugin>3.5.6</version.surefire.plugin>

0 commit comments

Comments
 (0)