Skip to content

Commit 9c87a39

Browse files
committed
chore(ci): upgrade bash-buddy to v0.3.1
1 parent 0a47a9a commit 9c87a39

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

scripts/integration_test

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ source bash-buddy/lib/common_utils.sh
99
# prepare
1010
################################################################################
1111

12+
readonly default_build_jdk_version=11
1213
# shellcheck disable=SC2034
1314
PREPARE_JDKS_INSTALL_BY_SDKMAN=(
14-
8.322.06.2-amzn
15-
11.0.14-ms
16-
17.0.2.8.1-amzn
15+
8
16+
$default_build_jdk_version
17+
17
1718
)
1819

1920
source bash-buddy/lib/prepare_jdks.sh
@@ -48,9 +49,7 @@ cd ..
4849
export CI_TEST_MODE=true
4950
export DCM_AGENT_SUPRESS_EXCEPTION_STACK=true
5051

51-
default_build_jdk_version=11
52-
53-
prepare_jdks::switch_java_home_to_jdk "$default_build_jdk_version"
52+
prepare_jdks::switch_to_jdk "$default_build_jdk_version"
5453

5554
cu::head_line_echo "build and test with Java: $JAVA_HOME"
5655
jvb::mvn_cmd clean install
@@ -59,11 +58,11 @@ jvb::mvn_cmd clean install
5958
# test multi-version java
6059
# shellcheck disable=SC2154
6160
########################################
62-
for jhome_var_name in "${JDK_HOME_VAR_NAMES[@]}"; do
61+
for jdk in "${PREPARE_JDKS_INSTALL_BY_SDKMAN[@]}"; do
6362
# already tested by above `mvn install`
64-
[ "JDK${default_build_jdk_version}_HOME" = "$jhome_var_name" ] && continue
63+
[ "$default_build_jdk_version" = "$jdk" ] && continue
6564

66-
prepare_jdks::switch_java_home_to_jdk "${!jhome_var_name}"
65+
prepare_jdks::switch_to_jdk "$jdk"
6766

6867
cu::head_line_echo "test with Java: $JAVA_HOME"
6968
# just test without build

0 commit comments

Comments
 (0)