Skip to content

Commit 2cf2662

Browse files
wip
1 parent fc40eed commit 2cf2662

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

.circleci/config.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
version: 2.1
22

33
parameters:
4-
maven-image:
4+
default-maven-image:
55
type: string
66
default: "cimg/openjdk:11.0"
7-
# arg-line:
8-
# type: string
9-
# default: "--add-opens=java.base/java.nio=ALL-UNNAMED"
10-
# exe:
11-
# type: executor
12-
# default: docker-amd64-image
137

148
executors:
159
docker-amd64-image:
1610
parameters:
1711
maven-image:
1812
type: string
19-
default: "cimg/openjdk:11.0"
13+
default: << pipeline.parameters.default-maven-image >>
2014
docker:
2115
- image: <<parameters.maven-image>>
2216
- image: influxdb:3-core
@@ -28,7 +22,7 @@ executors:
2822
parameters:
2923
maven-image:
3024
type: string
31-
default: "cimg/openjdk:11.0"
25+
default: << pipeline.parameters.default-maven-image >>
3226
docker:
3327
- image: <<parameters.maven-image>>
3428
- image: influxdb:3-core
@@ -65,13 +59,12 @@ commands:
6559
shasum -a 256 -c codecov.SHA256SUM
6660
sudo chmod +x codecov
6761
68-
6962
jobs:
7063
tests-java:
7164
parameters:
7265
maven-image:
7366
type: string
74-
default: &default-maven-image "cimg/openjdk:11.0"
67+
default: << pipeline.parameters.default-maven-image >>
7568
exe:
7669
type: executor
7770
default: docker-amd64-image
@@ -132,9 +125,9 @@ jobs:
132125
parameters:
133126
maven-image:
134127
type: string
135-
default: << pipeline.parameters.maven-image >>
128+
default: << pipeline.parameters.default-maven-image >>
136129
docker:
137-
- image: << pipeline.parameters.maven-image >>
130+
- image: << pipeline.parameters.default-maven-image >>
138131
steps:
139132
- checkout
140133
- restore_cache:
@@ -149,7 +142,7 @@ jobs:
149142
parameters:
150143
maven-image:
151144
type: string
152-
default: *default-maven-image
145+
default: << pipeline.parameters.default-maven-image >>
153146
docker:
154147
- image: << parameters.maven-image >>
155148
steps:
@@ -166,7 +159,7 @@ jobs:
166159
parameters:
167160
maven-image:
168161
type: string
169-
default: *default-maven-image
162+
default: << pipeline.parameters.default-maven-image >>
170163
docker:
171164
- image: << parameters.maven-image >>
172165
steps:
@@ -181,7 +174,7 @@ jobs:
181174

182175
deploy-snapshot:
183176
docker:
184-
- image: *default-maven-image
177+
- image: << pipeline.parameters.default-maven-image >>
185178
steps:
186179
- run:
187180
name: Early return if this build is from a forked repository
@@ -228,7 +221,7 @@ workflows:
228221
matrix:
229222
parameters:
230223
exe: [ docker-amd64-image, docker-arm64-image ]
231-
maven-image: [ "cimg/openjdk:11.0", "cimg/openjdk:17.0", "cimg/openjdk:20.0", "cimg/openjdk:21.0" ]
224+
maven-image: [ << pipeline.parameters.default-maven-image >>, "cimg/openjdk:17.0", "cimg/openjdk:20.0", "cimg/openjdk:21.0" ]
232225
- deploy-snapshot:
233226
requires:
234227
- check-dependencies

0 commit comments

Comments
 (0)