Skip to content

Commit 0b07ff5

Browse files
authored
Merge pull request #99 from hazendaz/master
[actions] Move to newer jdk support
2 parents b76f5ab + 870d26f commit 0b07ff5

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@ jobs:
2424
strategy:
2525
matrix:
2626
os: [ubuntu-latest, macOS-latest, windows-latest]
27-
java: [8, 11, 15, 16-ea]
27+
java: [8, 11, 16, 17-ea]
28+
distribution: ['adopt']
2829
fail-fast: false
2930
max-parallel: 4
3031
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
3132

3233
steps:
3334
- uses: actions/checkout@v2
3435
- name: Set up JDK
35-
uses: actions/setup-java@v1
36+
uses: actions/setup-java@v2
3637
with:
3738
java-version: ${{ matrix.java }}
39+
distribution: ${{ matrix.distribution }}
3840
- name: Test with Maven
3941
run: ./mvnw test -B -D"license.skip=true"

.github/workflows/coveralls.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v2
2727
- name: Set up JDK
28-
uses: actions/setup-java@v1
28+
uses: actions/setup-java@v2
2929
with:
3030
java-version: 8
31+
distribution: adopt
3132
- name: Report Coverage to Coveralls for Pull Requests
3233
if: github.event_name == 'pull_request'
3334
run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER

.github/workflows/sonar.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ jobs:
3131
# Disabling shallow clone is recommended for improving relevancy of reporting
3232
fetch-depth: 0
3333
- name: Set up JDK
34-
uses: actions/setup-java@v1
34+
uses: actions/setup-java@v2
3535
with:
3636
java-version: 11
37+
distribution: adopt
3738
- name: Analyze with SonarCloud
3839
run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_freemarker-scripting -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true
3940
env:

.github/workflows/sonatype.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v2
3030
- name: Set up JDK
31-
uses: actions/setup-java@v1
31+
uses: actions/setup-java@v2
3232
with:
3333
java-version: 11
34+
distribution: adopt
3435
- name: Deploy to Sonatype
3536
run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true
3637
env:

0 commit comments

Comments
 (0)