Skip to content

Commit 871608d

Browse files
timefold-releasetriceo
authored andcommitted
build: release version 1.2.0
1 parent 269c655 commit 871608d

File tree

23 files changed

+46
-86
lines changed

23 files changed

+46
-86
lines changed

.github/workflows/pull_request.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# Clone timefold-solver
2020
# Need to check for stale repo, since Github is not aware of the build chain and therefore doesn't automate it.
2121
- name: Checkout timefold-solver to access the scripts
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v3
2323
with:
2424
path: './timefold-solver'
2525
repository: 'TimefoldAI/timefold-solver'
@@ -34,7 +34,7 @@ jobs:
3434
./timefold-solver/.github/scripts/check_chain_repo.sh
3535
rm -rf ./timefold-solver
3636
- name: Checkout the proper timefold-solver branch
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v3
3838
with:
3939
repository: ${{ env.TARGET_CHAIN_USER }}/${{ env.TARGET_CHAIN_REPO }}
4040
ref: ${{ env.TARGET_CHAIN_BRANCH }}
@@ -51,7 +51,7 @@ jobs:
5151
# Clone timefold-quickstarts
5252
# No need to check for stale repo, as Github merges the main repo into the fork automatically.
5353
- name: Checkout timefold-quickstarts
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v3
5555
with:
5656
path: './timefold-quickstarts'
5757

.github/workflows/pull_request_gradle.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Clone timefold-solver
1919
# Need to check for stale repo, since Github is not aware of the build chain and therefore doesn't automate it.
2020
- name: Checkout timefold-solver to access the scripts
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v3
2222
with:
2323
path: './timefold-solver'
2424
repository: 'TimefoldAI/timefold-solver'
@@ -33,7 +33,7 @@ jobs:
3333
./timefold-solver/.github/scripts/check_chain_repo.sh
3434
rm -rf ./timefold-solver
3535
- name: Checkout the proper timefold-solver branch
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v3
3737
with:
3838
repository: ${{ env.TARGET_CHAIN_USER }}/${{ env.TARGET_CHAIN_REPO }}
3939
ref: ${{ env.TARGET_CHAIN_BRANCH }}
@@ -50,7 +50,7 @@ jobs:
5050
# Clone timefold-quickstarts
5151
# No need to check for stale repo, as Github merges the main repo into the fork automatically.
5252
- name: Checkout timefold-quickstarts
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v3
5454
with:
5555
path: './timefold-quickstarts'
5656

.github/workflows/release-pr-body-development.md

-3
This file was deleted.

.github/workflows/release-pr-body-stable.md .github/workflows/release-pr-body.md

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ At this point, the release of _Timefold Quickstarts_ is ready to be published.
22

33
- Release branch has been created.
44
- Git tag has been published.
5-
- PR has been prepared to switch `development` branch to a new SNAPSHOT version.
65

76
To finish the release of _Timefold Quickstarts_,
87
review and merge this PR to update the `stable` branch with new code.

.github/workflows/release.yml

+9-45
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,16 @@ on:
1717
description: 'Release branch to create (e.g. 1.0.x for version 1.0.0; once created, branch protection rules apply)'
1818
default: dry_run
1919
required: true
20-
nextVersion:
21-
description: 'Next version after release (e.g. 1.1.0, -SNAPSHOT will be added automatically)'
22-
required: true
23-
nextMicroVersion:
24-
description: 'Next version after release for release branch (e.g. 1.0.1, -SNAPSHOT will be added automatically)'
25-
required: true
2620
jobs:
2721
build:
2822
env:
2923
MAVEN_ARGS: "--no-transfer-progress --batch-mode"
3024
runs-on: ubuntu-latest
3125
steps:
32-
- name: Print inputs to the release workflow
33-
run: echo "${{ toJSON(github.event.inputs) }}"
34-
- name: Checkout the relevant timefold-solver tag
26+
- name: Checkout timefold-quickstarts
3527
uses: actions/checkout@v4
3628
with:
37-
repository: "TimefoldAI/timefold-solver"
38-
path: "./timefold-solver"
3929
fetch-depth: 0
40-
ref: v${{ github.event.inputs.version }}
4130

4231
- uses: actions/setup-java@v3
4332
with:
@@ -50,19 +39,7 @@ jobs:
5039
with:
5140
maven-version: 3.9.3
5241

53-
# No need to wait for the upstream release to show up in Maven Central.
54-
- name: Build the upstream release tag
55-
working-directory: "./timefold-solver"
56-
run: |
57-
mvn -Dquickly install
58-
cd ..
59-
rm -rf timefold-solver
60-
61-
- name: Checkout timefold-quickstarts
62-
uses: actions/checkout@v4
63-
with:
64-
fetch-depth: 0
65-
42+
# This step will fail if the Solver binaries aren't already on Maven Central.
6643
- name: Create release branch and build release
6744
run: |
6845
git config user.name "Timefold Release Bot"
@@ -72,7 +49,7 @@ jobs:
7249
export NEW_VERSION="${{ github.event.inputs.version }}"
7350
.github/scripts/change_versions.sh
7451
mvn verify
75-
git commit -am "chore: switch to version $NEW_VERSION"
52+
git commit -am "build: switch to version $NEW_VERSION"
7653
git tag -a "v${{ github.event.inputs.version }}" -m "Release version ${{ github.event.inputs.version }}"
7754
git push --tags
7855
@@ -87,30 +64,17 @@ jobs:
8764
git merge -s ours --no-edit ${{ github.event.inputs.stableBranch }}
8865
git checkout ${{ github.event.inputs.releaseBranch }}-bump
8966
git merge --squash ${{ github.event.inputs.releaseBranch }}
90-
git commit -m "chore: release version ${{ github.event.inputs.version }}"
67+
git commit -m "build: release version ${{ github.event.inputs.version }}"
9168
git push origin ${{ github.event.inputs.releaseBranch }}-bump
92-
gh pr create --reviewer triceo,ge0ffrey --base ${{ github.event.inputs.stableBranch }} --head ${{ github.event.inputs.releaseBranch }}-bump --title "chore: release version ${{ github.event.inputs.version }}" --body-file .github/workflows/release-pr-body-stable.md
69+
gh pr create --reviewer triceo --base ${{ github.event.inputs.stableBranch }} --head ${{ github.event.inputs.releaseBranch }}-bump --title "build: release version ${{ github.event.inputs.version }}" --body-file .github/workflows/release-pr-body.md
9370
env:
9471
GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
9572

96-
- name: Set micro snapshot version on the release branch
73+
- name: Put back the 999-SNAPSHOT version on the release branch
9774
run: |
9875
git checkout ${{ github.event.inputs.releaseBranch }}
9976
export OLD_VERSION="$(find . -name pom.xml -exec grep '<version.ai.timefold.solver>' {} \;|tail -n 1|cut -d\> -f1 --complement|cut -d\< -f1)"
100-
export NEW_VERSION="${{ github.event.inputs.nextMicroVersion }}-SNAPSHOT"
101-
.github/scripts/change_versions.sh
102-
git commit -am "chore: switch to version $NEW_VERSION"
103-
git push origin ${{ github.event.inputs.releaseBranch }}
104-
105-
- name: Switch development branch to next version and prepare PR
106-
run: |
107-
git checkout ${{ github.event.inputs.developmentBranch }}
108-
git checkout -B ${{ github.event.inputs.releaseBranch }}-bump2
109-
export OLD_VERSION="$(find . -name pom.xml -exec grep '<version.ai.timefold.solver>' {} \;|tail -n 1|cut -d\> -f1 --complement|cut -d\< -f1)"
110-
export NEW_VERSION="${{ github.event.inputs.nextVersion }}-SNAPSHOT"
77+
export NEW_VERSION="999-SNAPSHOT"
11178
.github/scripts/change_versions.sh
112-
git commit -am "chore: switch to version $NEW_VERSION"
113-
git push origin ${{ github.event.inputs.releaseBranch }}-bump2
114-
gh pr create --reviewer triceo,ge0ffrey --base ${{ github.event.inputs.developmentBranch }} --head ${{ github.event.inputs.releaseBranch }}-bump2 --title "chore: move to ${{ github.event.inputs.nextVersion }}-SNAPSHOT" --body-file .github/workflows/release-pr-body-development.md
115-
env:
116-
GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
79+
git commit -am "build: move back to version $NEW_VERSION"
80+
git push origin ${{ github.event.inputs.releaseBranch }}

build/quickstarts-showcase/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>ai.timefold.solver</groupId>
77
<artifactId>timefold-solver-quickstarts-parent</artifactId>
8-
<version>1.1.0</version>
8+
<version>1.2.0</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

hello-world/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id "application"
44
}
55

6-
def timefoldVersion = "1.1.0"
6+
def timefoldVersion = "1.2.0"
77
def logbackVersion = "1.4.7"
88
def junitJupiterVersion = "5.9.0"
99
def assertjVersion = "3.24.2"

hello-world/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<jar.with.dependencies.name>hello-world-run</jar.with.dependencies.name>
1414

15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616
<version.org.assertj>3.24.2</version.org.assertj>
1717
<version.org.junit.jupiter>5.10.0</version.org.junit.jupiter>
1818
<version.org.logback>1.4.11</version.org.logback>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>ai.timefold.solver</groupId>
88
<artifactId>timefold-solver-build-parent</artifactId>
9-
<version>1.1.0</version>
9+
<version>1.2.0</version>
1010
<relativePath/>
1111
</parent>
1212
<!-- IMPORTANT: the individual quickstarts have no parent pom. -->

technology/java-spring-boot/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id "java"
55
}
66

7-
def timefoldVersion = "1.1.0"
7+
def timefoldVersion = "1.2.0"
88
def assertjVersion = "3.24.2"
99

1010
group = "org.acme"

technology/java-spring-boot/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
15-
<version.org.springframework.boot>3.1.2</version.org.springframework.boot>
14+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
15+
<version.org.springframework.boot>3.1.3</version.org.springframework.boot>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.surefire.plugin>3.1.2</version.surefire.plugin>

technology/kotlin-quarkus/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.kotlin>1.9.0</version.kotlin>
16-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.kotlin>1.9.10</version.kotlin>
16+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1717

1818
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1919
<version.surefire.plugin>3.1.2</version.surefire.plugin>

use-cases/call-center/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.surefire.plugin>3.1.2</version.surefire.plugin>

use-cases/employee-scheduling/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.surefire.plugin>3.1.2</version.surefire.plugin>

use-cases/facility-location/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.surefire.plugin>3.1.2</version.surefire.plugin>

use-cases/food-packaging/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.surefire.plugin>3.1.2</version.surefire.plugin>

use-cases/maintenance-scheduling/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.surefire.plugin>3.1.2</version.surefire.plugin>

use-cases/order-picking/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.surefire.plugin>3.1.2</version.surefire.plugin>

use-cases/school-timetabling/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
def quarkusVersion = "3.0.3.Final"
7-
def timefoldVersion = "1.1.0"
7+
def timefoldVersion = "1.2.0"
88
def assertjVersion = "3.24.2"
99

1010
group = "org.acme"

use-cases/school-timetabling/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.resources.plugin>3.3.1</version.resources.plugin>

use-cases/vaccination-scheduling/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.surefire.plugin>3.1.2</version.surefire.plugin>

use-cases/vehicle-routing-capacity/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.resources.plugin>3.3.1</version.resources.plugin>

use-cases/vehicle-routing-time-windows/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.release>17</maven.compiler.release>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313

14-
<version.io.quarkus>3.2.4.Final</version.io.quarkus>
15-
<version.ai.timefold.solver>1.1.0</version.ai.timefold.solver>
14+
<version.io.quarkus>3.3.2</version.io.quarkus>
15+
<version.ai.timefold.solver>1.2.0</version.ai.timefold.solver>
1616

1717
<version.compiler.plugin>3.11.0</version.compiler.plugin>
1818
<version.resources.plugin>3.3.1</version.resources.plugin>

0 commit comments

Comments
 (0)