From 2cfe732fc8c67ab04350c1b54326e46ce4039d60 Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Mon, 2 Oct 2023 19:26:48 +1100
Subject: [PATCH] Test on Java 21
Bump `actions/setup-java` to `v2` as well, which requires specifying a
distribution and use 8 instead of 1.8.
---
.github/workflows/ci.yml | 15 +++++++++------
.github/workflows/release.yml | 5 +++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 381d7c73..df0fa28f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,15 +9,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [1.8, 11, 17]
+ java: [8, 11, 17, 21]
steps:
- name: Checkout sources
uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
+ distribution: 'zulu'
- name: Build
run: mvn -B package javadoc:javadoc
@@ -29,9 +30,10 @@ jobs:
uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
- java-version: 1.8
+ java-version: 8
+ distribution: 'zulu'
- name: Build with coverage
run: mvn -B -Pcoverage clean test jacoco:report-aggregate
@@ -46,9 +48,10 @@ jobs:
uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
- java-version: 1.8
+ java-version: 8
+ distribution: 'zulu'
- name: Android Lint checks
run: cd commonmark-android-test && ./gradlew :app:lint
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4edf451c..2d269e64 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,9 +17,10 @@ jobs:
uses: actions/checkout@v2
- name: Set up Maven Central repository
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
- java-version: 1.8
+ java-version: 8
+ distribution: 'zulu'
server-id: ossrh
server-username: MAVEN_USERNAME # env variable to use for username in release
server-password: MAVEN_PASSWORD # env variable to use for password in release
--
GitLab