Skip to content

Commit 2854ed2

Browse files
committed
Fix circle
1 parent f20cd55 commit 2854ed2

1 file changed

Lines changed: 3 additions & 15 deletions

File tree

.circleci/config.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ commands:
4949
type: string
5050
jdk:
5151
type: string
52-
use_jdk11:
53-
type: string
54-
default: "false"
5552
sstable_format:
5653
type: string
5754
default: "big"
@@ -69,7 +66,6 @@ commands:
6966
INTEGRATION_MAX_HEAP_SIZE: "3072m"
7067
CORE_MAX_PARALLEL_FORKS: 3
7168
CORE_TEST_MAX_HEAP_SIZE: "2048m"
72-
CASSANDRA_USE_JDK11: <<parameters.use_jdk11>>
7369
CASSANDRA_VERSION: "<<parameters.cassandra>>"
7470
command: |
7571
export GRADLE_OPTS="-Xmx2g -Dorg.gradle.jvmargs=-Xmx2g"
@@ -84,9 +80,6 @@ commands:
8480
type: string
8581
jdk:
8682
type: string
87-
use_jdk11:
88-
type: string
89-
default: "false"
9083
cassandra:
9184
type: string
9285
description: Build and integration test against Spark <<parameters.spark>> Scala <<parameters.scala>> <<parameters.jdk>>
@@ -98,7 +91,6 @@ commands:
9891
JDK_VERSION: "<<parameters.jdk>>"
9992
INTEGRATION_MAX_PARALLEL_FORKS: 1
10093
INTEGRATION_MAX_HEAP_SIZE: "3072M"
101-
CASSANDRA_USE_JDK11: <<parameters.use_jdk11>>
10294
command: |
10395
export GRADLE_OPTS="-Xmx2g -Dorg.gradle.jvmargs=-Xmx2g"
10496
export DTEST_JAR="dtest-<< parameters.cassandra >>.jar"
@@ -174,8 +166,10 @@ jobs:
174166
- checkout
175167
- run:
176168
name: Build dependencies for jdk11 builds
169+
environment:
170+
CASSANDRA_USE_JDK11: "true"
177171
command: |
178-
CASSANDRA_USE_JDK11=true ./scripts/build-dependencies.sh
172+
./scripts/build-dependencies.sh
179173
./gradlew --no-daemon --max-workers=2 codeCheckTasks
180174
- persist_to_workspace:
181175
root: dependencies
@@ -196,7 +190,6 @@ jobs:
196190
spark: "3"
197191
scala: "2.12"
198192
jdk: "11"
199-
use_jdk11: "true"
200193
sstable_format: "big"
201194
cassandra: "4.0"
202195

@@ -227,7 +220,6 @@ jobs:
227220
spark: "3"
228221
scala: "2.12"
229222
jdk: "11"
230-
use_jdk11: "true"
231223
sstable_format: "big"
232224
cassandra: "4.1"
233225

@@ -260,7 +252,6 @@ jobs:
260252
spark: "3"
261253
scala: "2.12"
262254
jdk: "11"
263-
use_jdk11: "true"
264255
cassandra: "4.0.17"
265256

266257
- store_artifacts:
@@ -297,7 +288,6 @@ jobs:
297288
spark: "3"
298289
scala: "2.12"
299290
jdk: "11"
300-
use_jdk11: "true"
301291
cassandra: "4.1.4"
302292

303293
- store_artifacts:
@@ -332,7 +322,6 @@ jobs:
332322
spark: "3"
333323
scala: "2.13"
334324
jdk: "11"
335-
use_jdk11: "true"
336325
sstable_format: "bti"
337326
cassandra: "5.0"
338327

@@ -365,7 +354,6 @@ jobs:
365354
spark: "3"
366355
scala: "2.13"
367356
jdk: "11"
368-
use_jdk11: "true"
369357
cassandra: "5.0.5"
370358

371359
- store_artifacts:

0 commit comments

Comments
 (0)