Merge branch 'master' into dev

dromara · Jun 12, 2024 · be575ca · be575ca
2 parents 5a5d6ef + f4e6824
commit be575ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -10,13 +10,13 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          cache: 'maven'
           java-version: 8
+          cache: 'maven'
+          cache-dependency-path: 'pom.xml'
           server-id: oss
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
@@ -2,29 +2,19 @@ name: Java CI
 on: [push, pull_request]
 
 jobs:
-  buildOnJava8:
-    name: build on java8
+  build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '8', '21' ]
+    name: Java ${{ matrix.Java }} build
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
+          java-version: ${{ matrix.java }}
           cache: 'maven'
-          java-version: 8
-      - name: Build with Maven
-        run: mvn package -P !develop
-  buildOnJava21:
-    name: build on java21
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 21
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          cache: 'maven'
-          java-version: 21
+          cache-dependency-path: 'pom.xml'
       - name: Build with Maven
         run: mvn package -P !develop