Merge branch 'carldea/master' into dev

f1714726 · 智布道 · a3108cac · f9e3053e · f1714726 · f1714726
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

.github/workflows/deploy-snapshot.yml .github/workflows/deploy-snapshot.yml +2 -2

.github/workflows/test-pr.yml .github/workflows/test-pr.yml +1 -1

未找到文件。
--- a/.github/workflows/deploy-snapshot.yml
+++ b/.github/workflows/deploy-snapshot.yml
@@ -16,7 +16,7 @@ jobs:
        uses: actions/setup-java@v2
        with:
          java-version: '8'
-          distribution: 'adopt'
+          distribution: 'zulu'
      - name: Cache m2 package
        uses: actions/cache@v2
        with:
@@ -36,7 +36,7 @@ jobs:
        uses: actions/setup-java@v2
        with:
          java-version: '8'
-          distribution: 'adopt'
+          distribution: 'zulu'
          server-id: ossrh
          server-username: MAVEN_USERNAME
          server-password: MAVEN_PASSWORD

--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -15,7 +15,7 @@ jobs:
        uses: actions/setup-java@v2
        with:
          java-version: '8'
-          distribution: 'adopt'
+          distribution: 'zulu'
      - name: Cache m2 package
        uses: actions/cache@v2
        with: