Skip to content

Commit 71e2278

Browse files
alexander-yakushevbbatsov
authored andcommitted
[ci] Test against JDK25
1 parent c1fd8a9 commit 71e2278

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ executors:
2929
docker:
3030
- image: clojure:temurin-21-lein-2.12.0-noble
3131
<<: *defaults
32-
jdk24:
32+
jdk25:
3333
docker:
34-
- image: clojure:temurin-24-lein-2.12.0-noble
34+
- image: clojure:temurin-25-lein-2.12.0-noble
3535
<<: *defaults
3636

3737
# Runs a given set of steps, with some standard pre- and post-
@@ -81,7 +81,7 @@ commands:
8181
- base-src-jdk11.zip
8282
- base-src-jdk17.zip
8383
- base-src-jdk21.zip
84-
- base-src-jdk24.zip
84+
- base-src-jdk25.zip
8585
key: cache-<< parameters.cache_version >>-{{ checksum "/tmp/clojure_cache_seed" }}
8686

8787
setup-windows:
@@ -98,7 +98,7 @@ jobs:
9898
clojure_version:
9999
type: string
100100
default: "1.12"
101-
executor: jdk24
101+
executor: jdk25
102102
environment:
103103
CLOJURE_VERSION: << parameters.clojure_version >>
104104
TEST_PROFILES: "-user,-dev,+test,+cljs"
@@ -184,15 +184,15 @@ workflows:
184184
matrix:
185185
alias: "test"
186186
parameters:
187-
jdk_version: [jdk8, jdk11, jdk17, jdk21, jdk24]
187+
jdk_version: [jdk8, jdk11, jdk17, jdk21, jdk25]
188188
clojure_version: ["1.10", "1.11", "1.12"]
189189
<<: *run_always
190190
- test:
191191
# Sanity check that we don't have a requirement for Clojurescript being on the classpath.
192192
matrix:
193193
alias: "test_no_extra_deps"
194194
parameters:
195-
jdk_version: [jdk24]
195+
jdk_version: [jdk25]
196196
clojure_version: ["1.12"]
197197
command: ["test-no-extra-deps"]
198198
<<: *run_always

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ base-src-jdk17.zip:
3030
base-src-jdk21.zip:
3131
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk21u/archive/refs/tags/jdk-21.0.7+5.zip jdk21 $@
3232

33-
base-src-jdk24.zip:
34-
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-24+36.zip jdk24 $@
33+
base-src-jdk25.zip:
34+
bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-25+36.zip jdk25 $@
3535

3636
copy-sources-to-jdk: base-src-$(JDK_SRC_VERSION).zip
3737
mkdir -p $(JAVA_HOME)/lib && cp base-src-$(JDK_SRC_VERSION).zip $(JAVA_HOME)/lib/src.zip

0 commit comments

Comments
 (0)