From 32ba41174301ce7eeb7f2039bbfcd57b56b4cfb6 Mon Sep 17 00:00:00 2001 From: Zhichun Wu Date: Mon, 29 Nov 2021 20:01:19 +0800 Subject: [PATCH 1/3] Enable toolchain with multiple JDKs --- .github/workflows/release.yml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53d031180..e290f571b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,11 +16,34 @@ jobs: steps: - name: Check out Git repository uses: actions/checkout@v2 - - name: Install Java and Maven - uses: actions/setup-java@v1 + - name: Install JDK 11 + uses: AdoptOpenJDK/install-jdk@v1 with: - java-version: 11 - - name: Update pom files and reduce logs + version: '11' + targets: 'JDK11_HOME' + - name: Setup Toolchain + shell: bash + run: | + mkdir -p $HOME/.m2 \ + && cat << EOF > $HOME/.m2/toolchains.xml + + + + jdk + + 11 + + + ${env.JDK11_HOME} + + + + EOF + - name: Install JDK 8 and Maven + uses: actions/setup-java@v2 + with: + java-version: 8 + - name: Update Configuration run: | find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ github.event.inputs.version }}|g' \ -e 's|^\( \).*\(\)$|\1${{ github.event.inputs.version }}\2|' \ From b731608eca5147b75335ad4df48068f557f663e1 Mon Sep 17 00:00:00 2001 From: Zhichun Wu Date: Mon, 29 Nov 2021 20:13:42 +0800 Subject: [PATCH 2/3] Fix substitution issue --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e290f571b..0433a4818 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: 11 - ${env.JDK11_HOME} + ${{ env.JDK11_HOME }} From d83f10b4948bfc76805b36fdad926e795eeaa918 Mon Sep 17 00:00:00 2001 From: Zhichun Wu Date: Mon, 29 Nov 2021 20:16:24 +0800 Subject: [PATCH 3/3] Add JDK distribution --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0433a4818..9cd0c2c5f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,6 +42,7 @@ jobs: - name: Install JDK 8 and Maven uses: actions/setup-java@v2 with: + distribution: 'temurin' java-version: 8 - name: Update Configuration run: |