From f0a973e4f2b33cabb366b608b457e10ed92cee48 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 20 Oct 2023 19:53:51 -0400 Subject: [PATCH 1/2] [GHA] Fix checkout --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 2 +- .github/workflows/samples.yaml | 2 +- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9634d8c..c67b5ac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: fail-fast: false max-parallel: 6 steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 2064006..ad28d14 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -5,7 +5,7 @@ jobs: if: github.repository_owner == 'mybatis' runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index 7ce8172..2930e87 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -29,7 +29,7 @@ jobs: fail-fast: false max-parallel: 10 steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 - name: Set up GraalVM uses: graalvm/setup-graalvm@v1 with: diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index b0f3de8..dc9a1ec 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -8,7 +8,7 @@ jobs: if: github.repository_owner == 'mybatis' runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 9426132..6ddc365 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -8,7 +8,7 @@ jobs: if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: From e689f63ca2d40154268c08110e5463fe0ebbb921 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 20 Oct 2023 19:54:01 -0400 Subject: [PATCH 2/2] [GHA] Move to use java 21 --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 2 +- .github/workflows/samples.yaml | 2 +- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c67b5ac..97e81af 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,7 @@ jobs: - 'windows-latest' - 'macos-latest' java: - - 17 + - 21 fail-fast: false max-parallel: 6 steps: diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index ad28d14..023d797 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -9,7 +9,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Cache local Maven repository uses: actions/cache@v3 diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index 2930e87..ea37c7d 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -12,7 +12,7 @@ jobs: - 'ubuntu-latest' - 'windows-latest' java: - - 17 + - 21 sample: - 'simple' - 'xml' diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index dc9a1ec..08f2cbe 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Cache local Maven repository uses: actions/cache@v3 diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 6ddc365..9ad6b60 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -12,7 +12,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Cache local Maven repository uses: actions/cache@v3