Skip to content

Commit

Permalink
chore(ci): upgrade bash-buddy to v0.3.2; improve appveyor.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
oldratlee committed Jul 13, 2022
1 parent f6cfcb4 commit bf12892
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
5 changes: 4 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,15 @@ for:
- scripts/integration_test

after_test:
# clear self maven install
# clear self maven install files
- rm -rf $HOME/.m2/repository/com/alibaba/cola
- rm -rf $HOME/.m2/repository/com/alibaba/craftsman
- rm -rf $HOME/.m2/repository/com/alibaba/demo
# remove maven install files
- rm -rf $HOME/.m2/wrapper/dists/*/*/*.zip
# remove sdkman install files
- rm -rf $HOME/.sdkman/archives/*
- rm -rf $HOME/.sdkman/tmp/*

cache:
# if cache size is exceed appveyor limit:
Expand Down
15 changes: 7 additions & 8 deletions scripts/integration_test
Original file line number Diff line number Diff line change
Expand Up @@ -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
readonly PREPARE_JDKS_INSTALL_BY_SDKMAN=(
8
"$default_build_jdk_version"
17
)

source bash-buddy/lib/prepare_jdks.sh
Expand Down Expand Up @@ -117,9 +118,7 @@ test_cola_archetype() {
# default jdk 11, do build and test
########################################

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"

Expand All @@ -134,7 +133,7 @@ for jhome_var_name in "${JDK_HOME_VAR_NAMES[@]}"; do
# already tested by above `mvn install`
[ "JDK${default_build_jdk_version}_HOME" = "$jhome_var_name" ] && continue

prepare_jdks::switch_java_home_to_jdk "${!jhome_var_name}"
prepare_jdks::switch_to_jdk "${!jhome_var_name}"

cu::head_line_echo "test with Java: $JAVA_HOME"

Expand Down

0 comments on commit bf12892

Please sign in to comment.