chore(ci): upgrade bash-buddy to v0.3.1

alibaba · Apr 8, 2022 · 9c87a39 · 9c87a39
1 parent 0a47a9a
commit 9c87a39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/scripts/bash-buddy b/scripts/bash-buddy
diff --git a/scripts/integration_test b/scripts/integration_test
@@ -9,11 +9,12 @@ source bash-buddy/lib/common_utils.sh
 # prepare
 ################################################################################
 
+readonly default_build_jdk_version=11
 # shellcheck disable=SC2034
 PREPARE_JDKS_INSTALL_BY_SDKMAN=(
-    8.322.06.2-amzn
-    11.0.14-ms
-    17.0.2.8.1-amzn
+    8
+    $default_build_jdk_version
+    17
 )
 
 source bash-buddy/lib/prepare_jdks.sh
@@ -48,9 +49,7 @@ cd ..
 export CI_TEST_MODE=true
 export DCM_AGENT_SUPRESS_EXCEPTION_STACK=true
 
-default_build_jdk_version=11
-
-prepare_jdks::switch_java_home_to_jdk "$default_build_jdk_version"
+prepare_jdks::switch_to_jdk "$default_build_jdk_version"
 
 cu::head_line_echo "build and test with Java: $JAVA_HOME"
 jvb::mvn_cmd clean install
@@ -59,11 +58,11 @@ jvb::mvn_cmd clean install
 # test multi-version java
 # shellcheck disable=SC2154
 ########################################
-for jhome_var_name in "${JDK_HOME_VAR_NAMES[@]}"; do
+for jdk in "${PREPARE_JDKS_INSTALL_BY_SDKMAN[@]}"; do
     # already tested by above `mvn install`
-    [ "JDK${default_build_jdk_version}_HOME" = "$jhome_var_name" ] && continue
+    [ "$default_build_jdk_version" = "$jdk" ] && continue
 
-    prepare_jdks::switch_java_home_to_jdk "${!jhome_var_name}"
+    prepare_jdks::switch_to_jdk "$jdk"
 
     cu::head_line_echo "test with Java: $JAVA_HOME"
     # just test without build
+1 −4		.editorconfig
+104 −0		README.md
+1 −1		bin/.editorconfig
+14 −14		bin/gen_source_guard
+194 −54		lib/common_utils.sh
+96 −71		lib/java_build_utils.sh
+316 −177		lib/prepare_jdks.sh
+87 −59		lib/trap_error_info.sh
+87 −0		templates/appveyor.template.yml
+19 −18		templates/integration_test.template.sh