Skip to content

Commit

Permalink
Change CI build toolchains to JDK 8 + 21 versions.
Browse files Browse the repository at this point in the history
Signed-off-by: Sjoerd Talsma <[email protected]>
  • Loading branch information
sjoerdtalsma committed Dec 8, 2023
1 parent f268d08 commit 29b9e93
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/mvn-toolchains.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<toolchain>
<type>jdk</type>
<provides>
<version>11</version>
<version>21</version>
</provides>
<configuration>
<jdkHome>${env.JAVA_11_HOME}</jdkHome>
<jdkHome>${env.JAVA_21_HOME}</jdkHome>
</configuration>
</toolchain>
</toolchains>
19 changes: 8 additions & 11 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,16 @@ jobs:
run: sudo apt-get install graphviz
- name: Set up JDK 8 for compilation
id: setup-java-8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8
java-package: jdk
- name: Set up JDK 11 for decent Javadoc
id: setup-java-11
uses: actions/setup-java@v3
- name: Set up JDK 21
id: setup-java-21
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11
java-package: jdk
java-version: 21
- name: Setup maven cache
uses: actions/cache@v3
with:
Expand All @@ -52,7 +50,7 @@ jobs:
shell: bash
env:
JAVA_8_HOME: ${{ steps.setup-java-8.outputs.path }}
JAVA_11_HOME: ${{ steps.setup-java-11.outputs.path }}
JAVA_21_HOME: ${{ steps.setup-java-21.outputs.path }}
MAVEN_CLI_OPTS: --settings .github/mvn-settings.xml --global-toolchains .github/mvn-toolchains.xml
GPG_EXECUTABLE: /usr/bin/gpg
GPG_KEYNAME: ${{ secrets.GPG_KEYNAME }}
Expand Down Expand Up @@ -85,11 +83,10 @@ jobs:
git config user.email "[email protected]"
- name: Set up JDK
if: env.GH_TOKEN != null
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11
java-package: jdk
java-version: 21
- name: Set up maven cache
if: env.GH_TOKEN != null
uses: actions/cache@v3
Expand Down

0 comments on commit 29b9e93

Please sign in to comment.