Skip to content

Commit 03526e2

Browse files
Merge branch '1.0.x' into 1.1.x
2 parents e5404a6 + 8087e37 commit 03526e2

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

.circleci/config.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
11
version: 2.1
22

33
executors:
4+
circle-jdk23-executor:
5+
working_directory: ~/context-propagation
6+
environment:
7+
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
8+
docker:
9+
- image: cimg/openjdk:23.0.2
410
circle-jdk-executor:
511
working_directory: ~/context-propagation
612
environment:
713
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
814
docker:
9-
- image: cimg/openjdk:20.0.1
15+
- image: cimg/openjdk:21.0.6
1016
circle-jdk11-executor:
1117
working_directory: ~/context-propagation
1218
environment:
1319
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
1420
docker:
15-
- image: cimg/openjdk:11.0.19
21+
- image: cimg/openjdk:11.0.26
1622
circle-jdk17-executor:
1723
working_directory: ~/context-propagation
1824
environment:
1925
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
2026
docker:
21-
- image: cimg/openjdk:17.0.7
27+
- image: cimg/openjdk:17.0.14
2228
machine-executor:
2329
working_directory: ~/context-propagation
2430
machine:
25-
image: ubuntu-2204:2023.04.2
31+
image: ubuntu-2404:2024.11.1
2632

2733
commands:
2834
gradlew-build:
@@ -57,6 +63,11 @@ commands:
5763
path: ~/context-propagation/test-results/
5864

5965
jobs:
66+
build-jdk23:
67+
executor: circle-jdk23-executor
68+
steps:
69+
- gradlew-build
70+
6071
build:
6172
executor: circle-jdk-executor
6273
steps:
@@ -89,13 +100,15 @@ workflows:
89100
- build
90101
- build-jdk11
91102
- build-jdk17
103+
- build-jdk23
92104
- deploy:
93105
context:
94106
- deploy
95107
requires:
96108
- build
97109
- build-jdk11
98110
- build-jdk17
111+
- build-jdk23
99112
filters:
100113
branches:
101114
only:
@@ -121,13 +134,20 @@ workflows:
121134
ignore: /.*/
122135
tags:
123136
only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
137+
- build-jdk23:
138+
filters:
139+
branches:
140+
ignore: /.*/
141+
tags:
142+
only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
124143
- deploy:
125144
context:
126145
- deploy
127146
requires:
128147
- build
129148
- build-jdk11
130149
- build-jdk17
150+
- build-jdk23
131151
filters:
132152
tags:
133153
only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/

0 commit comments

Comments
 (0)