Skip to content

Commit 3675f01

Browse files
committed
[gha] Update github actions
1 parent 379daf3 commit 3675f01

File tree

7 files changed

+59
-100
lines changed

7 files changed

+59
-100
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ jobs:
1010
cache: [maven]
1111
distribution: [temurin]
1212
java: [17, 21, 23, 24-ea, 25-ea]
13-
os: [ubuntu-latest, macos-latest, windows-latest]
13+
os: [macos-latest, ubuntu-latest, windows-latest]
1414
fail-fast: false
1515
max-parallel: 4
1616
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
1717

1818
steps:
1919
- uses: actions/checkout@v4
20-
- name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }}
20+
- name: Setup Java ${{ matrix.java }} ${{ matrix.distribution }}
2121
uses: actions/setup-java@v4
2222
with:
23-
java-version: ${{ matrix.java }}
24-
distribution: ${{ matrix.distribution }}
2523
cache: ${{ matrix.cache }}
24+
distribution: ${{ matrix.distribution }}
25+
java-version: ${{ matrix.java }}
2626
- name: Test with Maven
2727
run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true"

.github/workflows/codeql.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
schedule:
9+
- cron: '37 14 * * 6'
10+
11+
jobs:
12+
analyze:
13+
name: Analyze
14+
runs-on: ubuntu-latest
15+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
16+
permissions:
17+
actions: read
18+
contents: read
19+
security-events: write
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
language: [ java-kotlin ]
25+
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@v4
29+
30+
- name: Setup Java
31+
uses: actions/setup-java@v4
32+
with:
33+
cache: maven
34+
java-version: 21
35+
distribution: 'temurin'
36+
37+
- name: Initialize CodeQL
38+
uses: github/codeql-action/init@v3
39+
with:
40+
languages: ${{ matrix.language }}
41+
queries: +security-and-quality
42+
43+
- name: Autobuild
44+
uses: github/codeql-action/autobuild@v3
45+
46+
- name: Perform CodeQL Analysis
47+
uses: github/codeql-action/analyze@v3
48+
with:
49+
category: "/language:${{ matrix.language }}"

.github/workflows/codeql.yml

Lines changed: 0 additions & 90 deletions
This file was deleted.

.github/workflows/coveralls.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: Coveralls
33
on: [push, pull_request]
44

55
jobs:
6-
build:
6+
coveralls:
77
if: github.repository_owner == 'mybatis'
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4
11-
- name: Set up JDK
11+
- name: Setup Java
1212
uses: actions/setup-java@v4
1313
with:
1414
cache: maven

.github/workflows/site.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Set up JDK
14+
- name: Setup Java
1515
uses: actions/setup-java@v4
1616
with:
1717
cache: maven

.github/workflows/sonar.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
with:
1515
# Disabling shallow clone is recommended for improving relevancy of reporting
1616
fetch-depth: 0
17-
- name: Set up JDK
17+
- name: Setup Java
1818
uses: actions/setup-java@v4
1919
with:
2020
cache: maven
2121
distribution: temurin
2222
java-version: 21
2323
- name: Analyze with SonarCloud
24-
run: ./mvnw verify jacoco:report sonar:sonar -B -V -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
24+
run: ./mvnw verify jacoco:report sonar:sonar -B -V -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress -Dsonar.scanner.skipJreProvisioning=true
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2727
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/sonatype.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Set up JDK
14+
- name: Setup Java
1515
uses: actions/setup-java@v4
1616
with:
1717
cache: maven

0 commit comments

Comments
 (0)