File tree Expand file tree Collapse file tree 6 files changed +26
-46
lines changed Expand file tree Collapse file tree 6 files changed +26
-46
lines changed Original file line number Diff line number Diff line change 77 runs-on : ${{ matrix.os }}
88 strategy :
99 matrix :
10+ cache : [maven]
11+ distribution : [temurin]
12+ java : [17, 21, 22, 23-ea]
1013 os : [ubuntu-latest, macos-latest, windows-latest]
11- java : [17]
12- distribution : ['temurin']
1314 fail-fast : false
1415 max-parallel : 4
1516 name : Test JDK ${{ matrix.java }}, ${{ matrix.os }}
2122 with :
2223 java-version : ${{ matrix.java }}
2324 distribution : ${{ matrix.distribution }}
24- - name : Cache local Maven repository
25- uses : actions/cache@v4
26- with :
27- path : ~/.m2/repository
28- key : ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
29- restore-keys : |
30- ${{ runner.os }}-maven-
25+ cache : ${{ matrix.cache }}
3126 - name : Test with Maven
3227 run : ./mvnw -pl core,extensions test -B -V --no-transfer-progress -D"license.skip=true"
Original file line number Diff line number Diff line change 5050 - name : Checkout repository
5151 uses : actions/checkout@v4
5252
53+ - name : Setup Java
54+ uses : actions/setup-java@v4
55+ with :
56+ java-version : 17
57+ distribution : ' temurin'
58+
5359 # Initializes the CodeQL tools for scanning.
5460 - name : Initialize CodeQL
5561 uses : github/codeql-action/init@v3
Original file line number Diff line number Diff line change 1111 - name : Set up JDK
1212 uses : actions/setup-java@v4
1313 with :
14- java-version : 17
15- distribution : zulu
16- - name : Cache local Maven repository
17- uses : actions/cache@v4
18- with :
19- path : ~/.m2/repository
20- key : ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
21- restore-keys : |
22- ${{ runner.os }}-maven-
14+ cache : maven
15+ distribution : temurin
16+ java-version : 21
2317 - name : Report Coverage to Coveralls for Pull Requests
2418 if : github.event_name == 'pull_request'
2519 run : ./mvnw -pl core,extensions -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress
Original file line number Diff line number Diff line change @@ -14,21 +14,18 @@ jobs:
1414 - name : Set up JDK
1515 uses : actions/setup-java@v4
1616 with :
17+ cache : maven
18+ distribution : temurin
1719 java-version : 21
18- distribution : zulu
19- - uses : webfactory/ssh-agent@master
20- with :
21- ssh-private-key : ${{ secrets.DEPLOY_KEY }}
2220 - name : Build site
23- run : ./mvnw site site:stage -DskipTests -B -V --no-transfer-progress -Dlicense.skip=true
21+ run : ./mvnw site site:stage -DskipTests -Dlicense.skip=true - B -V --no-transfer-progress --settings ./.mvn/settings.xml
2422 env :
2523 CI_DEPLOY_USERNAME : ${{ secrets.CI_DEPLOY_USERNAME }}
2624 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
25+ NVD_API_KEY : ${{ secrets.NVD_API_KEY }}
2726 - name : Deploy Site to gh-pages
28- uses : JamesIves/github-pages-deploy-action@v4.6.3
27+ uses : JamesIves/github-pages-deploy-action@v4
2928 with :
30- ssh-key : true
3129 branch : gh-pages
3230 folder : target/staging
33- env :
34- GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
31+ ssh-key : ${{ secrets.DEPLOY_KEY }}
Original file line number Diff line number Diff line change @@ -17,17 +17,11 @@ jobs:
1717 - name : Set up JDK
1818 uses : actions/setup-java@v4
1919 with :
20- java-version : 17
21- distribution : zulu
22- - name : Cache local Maven repository
23- uses : actions/cache@v4
24- with :
25- path : ~/.m2/repository
26- key : ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
27- restore-keys : |
28- ${{ runner.os }}-maven-
20+ cache : maven
21+ distribution : temurin
22+ java-version : 21
2923 - name : Analyze with SonarCloud
30- run : ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring-native -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-native -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
3125 env :
3226 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
3327 SONAR_TOKEN : ${{ secrets.SONAR_TOKEN }}
Original file line number Diff line number Diff line change 1414 - name : Set up JDK
1515 uses : actions/setup-java@v4
1616 with :
17- java-version : 17
18- distribution : zulu
19- - name : Cache local Maven repository
20- uses : actions/cache@v4
21- with :
22- path : ~/.m2/repository
23- key : ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
24- restore-keys : |
25- ${{ runner.os }}-maven-
17+ cache : maven
18+ distribution : temurin
19+ java-version : 21
2620 - name : Deploy to Sonatype
2721 run : ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true
2822 env :
You can’t perform that action at this time.
0 commit comments