chore(ci scripts): use JVB_MVN_OPTS, upgrade bash-buddy

Ganjiali · Feb 18, 2022 · 44034fb · 44034fb
1 parent 9551e52
commit 44034fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/scripts/bash-buddy b/scripts/bash-buddy
diff --git a/scripts/integration_test.sh b/scripts/integration_test.sh
@@ -20,6 +20,12 @@ source bash-buddy/lib/prepare_jdks.sh
 
 source bash-buddy/lib/java_build_utils.sh
 
+# shellcheck disable=SC2034
+JVB_MVN_OPTS=(
+    "${JVB_DEFAULT_MVN_OPTS[@]}"
+    -DperformRelease -P'!gen-sign'
+)
+
 ################################################################################
 # ci build logic
 ################################################################################
@@ -35,7 +41,7 @@ prepare_jdks::switch_java_home_to_jdk "$default_build_jdk_version"
 
 cu::head_line_echo "build and test with Java: $JAVA_HOME"
 
-jvb::mvn_cmd -DperformRelease -P'!gen-sign' clean install
+jvb::mvn_cmd clean install
 (
     cd auto-pipeline-examples
     cu::log_then_run ./gradlew clean test
@@ -54,7 +60,7 @@ for jhome_var_name in "${JDK_HOME_VAR_NAMES[@]}"; do
     cu::head_line_echo "test with Java: $JAVA_HOME"
 
     # just test without build
-    jvb::mvn_cmd -DperformRelease -P'!gen-sign' surefire:test
+    jvb::mvn_cmd surefire:test
     (
         cd auto-pipeline-examples
         cu::log_then_run ./gradlew clean test
+ −		docs/logo-social.png
+ −		docs/logo-social.png.png
+15 −15		lib/java_build_utils.sh
+65 −14		lib/prepare_jdks.sh
+2 −0		lib/trap_error_info.sh