Skip to content

Commit f00b53e

Browse files
authored
Merge pull request #860 from hazendaz/master
[GHA] Fix checkout and update jdks
2 parents 8745d74 + 37eac4b commit f00b53e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest, macOS-latest, windows-latest]
29-
java: [17, 20, 21-ea]
29+
java: [17, 21]
3030
distribution: ['zulu']
3131
fail-fast: false
3232
max-parallel: 5
3333
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
3434

3535
steps:
36-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
36+
- uses: actions/checkout@v4
3737
- name: Set up JDK
3838
uses: actions/setup-java@v3
3939
with:

.github/workflows/coveralls.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
if: github.repository_owner == 'mybatis'
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
28+
- uses: actions/checkout@v4
2929
- name: Set up JDK
3030
uses: actions/setup-java@v3
3131
with:
32-
java-version: 17
32+
java-version: 21
3333
distribution: zulu
3434
- name: Report Coverage to Coveralls for Pull Requests
3535
if: github.event_name == 'pull_request'

.github/workflows/sonar.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
if: github.repository_owner == 'mybatis'
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
29+
- uses: actions/checkout@v4
3030
with:
3131
# Disabling shallow clone is recommended for improving relevancy of reporting
3232
fetch-depth: 0
3333
- name: Set up JDK
3434
uses: actions/setup-java@v3
3535
with:
36-
java-version: 17
36+
java-version: 21
3737
distribution: zulu
3838
- name: Analyze with SonarCloud
3939
run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true

.github/workflows/sonatype.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]')
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
29+
- uses: actions/checkout@v4
3030
- name: Set up JDK
3131
uses: actions/setup-java@v3
3232
with:
33-
java-version: 17
33+
java-version: 21
3434
distribution: zulu
3535
- name: Deploy to Sonatype
3636
run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true

0 commit comments

Comments
 (0)