Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit0487662

Browse files
authored
Merge pull request#3972 from Rawi01/java-25-ci
Add JDK 25 to docker tests
2 parentse8fb461 +09cd1c7 commit0487662

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

‎.github/workflows/ant.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ jobs:
150150
needs:build
151151
strategy:
152152
matrix:
153-
jdk:[8, 11, 17, 21,23]
153+
jdk:[8, 11, 17, 21,25]
154154
tool:
155155
-{name: "maven", cmd: "mvn compile"}
156-
-{name: "gradle", cmd: "gradle assemble"}
156+
-{name: "gradle", cmd: "gradle assemble", buildArgs: {"25": "--build-arg gradle=9.1.0"}}
157157
-{name: "ant", cmd: "ant dist"}
158158
-{name: "bazel", cmd: "bazel build //:ProjectRunner"}
159159
fail-fast:false
@@ -170,7 +170,7 @@ jobs:
170170

171171
-name:Build container
172172
working-directory:./docker
173-
run:docker build --build-arg jdk=${{ matrix.jdk }} -t $IMAGE_NAME -f ${{ matrix.tool.name }}/Dockerfile .
173+
run:docker build --build-arg jdk=${{ matrix.jdk }}${{ matrix.tool.buildArgs[matrix.jdk] }}-t $IMAGE_NAME -f ${{ matrix.tool.name }}/Dockerfile .
174174

175175
-name:Compile in container
176176
run:docker run --entrypoint="" -v $(pwd)/lombok.jar:/workspace/lombok.jar $IMAGE_NAME /bin/bash -c "cd classpath; ${{ matrix.tool.cmd }}"
@@ -180,7 +180,7 @@ jobs:
180180
needs:build
181181
strategy:
182182
matrix:
183-
jdk:[8, 11, 17, 21,23]
183+
jdk:[8, 11, 17, 21,25]
184184
dir:[compileTests]
185185
fail-fast:false
186186

‎docker/maven/files/jdk-23/classpath/pom.xml‎renamed to ‎docker/maven/files/jdk-25/classpath/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10-
<java.version>23</java.version>
10+
<java.version>25</java.version>
1111
</properties>
1212

1313
<build>

‎docker/maven/files/jdk-23/modules/pom.xml‎renamed to ‎docker/maven/files/jdk-25/modules/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10-
<java.version>23</java.version>
10+
<java.version>25</java.version>
1111
</properties>
1212

1313
<build>

‎docker/provision/jdk/java-23.sh‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎docker/provision/jdk/java-25.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apt-get update&& apt-get install -y wget
2+
wget https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_linux_hotspot_25_36.tar.gz -O jdk.tar.gz
3+
tar -xzf jdk.tar.gz -C /opt/
4+
mv /opt/jdk-25+36 /opt/jdk

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp