From 9c6148fc0a2b93cf83febcc29d5d241cb518d39d Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Sun, 2 Jun 2024 15:37:45 +0800 Subject: [PATCH] chore: upgrade ci jdks to 17+ --- .github/workflows/ci.yaml | 2 +- .../ci_by_multiply_java_versions.yaml | 37 +++++-------------- scripts/integration_test | 6 +-- 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6f4f8043d..e31afaf55 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest ] - java: [ 8, 11 ] + java: [ 17 ] fail-fast: false max-parallel: 64 name: fast test on Java ${{ matrix.java }} OS ${{ matrix.os }} diff --git a/.github/workflows/ci_by_multiply_java_versions.yaml b/.github/workflows/ci_by_multiply_java_versions.yaml index 01f74a61e..a3f4435d1 100644 --- a/.github/workflows/ci_by_multiply_java_versions.yaml +++ b/.github/workflows/ci_by_multiply_java_versions.yaml @@ -15,41 +15,22 @@ jobs: with: submodules: recursive - - name: setup java8 - uses: actions/setup-java@v3 + - name: Setup Java + uses: actions/setup-java@v4 with: - java-version: 8 + # https://github.com/actions/setup-java?tab=readme-ov-file#install-multiple-jdks + java-version: | + 17 + 21 + 22 distribution: zulu - # only first java setup need enable cache cache: maven - - name: setup java11 - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: microsoft - - name: setup java17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: microsoft - - name: setup java19 - uses: actions/setup-java@v3 - with: - java-version: 19 - distribution: temurin - - name: setup java20 - uses: actions/setup-java@v3 - with: - java-version: 20 - distribution: zulu - run: scripts/integration_test env: - JAVA8_HOME: ${{ env.JAVA_HOME_8_X64 }} - JAVA11_HOME: ${{ env.JAVA_HOME_11_X64 }} JAVA17_HOME: ${{ env.JAVA_HOME_17_X64 }} - JAVA19_HOME: ${{ env.JAVA_HOME_19_X64 }} - JAVA20_HOME: ${{ env.JAVA_HOME_20_X64 }} + JAVA21_HOME: ${{ env.JAVA_HOME_21_X64 }} + JAVA22_HOME: ${{ env.JAVA_HOME_22_X64 }} - name: remove cola self maven install files run: rm -rf $HOME/.m2/repository/com/alibaba/{cola,craftsman} diff --git a/scripts/integration_test b/scripts/integration_test index c010a6cc5..7226fbaa5 100755 --- a/scripts/integration_test +++ b/scripts/integration_test @@ -12,14 +12,10 @@ source "$BASH_BUDDY_ROOT/lib/java_build_utils.sh" # ci build logic ################################################################################ -readonly default_build_jdk_version=11 +readonly default_build_jdk_version=17 # shellcheck disable=SC2034 readonly JDK_VERSIONS=( - 8 "$default_build_jdk_version" - 17 - 19 - 20 ) readonly default_jh_var_name="JAVA${default_build_jdk_version}_HOME"