This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch fixapitest
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git

commit 9fba07285b052fa28a3dff290943cfda4f9f0693
Author: kezhenxu94 <[email protected]>
AuthorDate: Thu Aug 24 20:04:52 2023 +0800

    Fix cache is overriden randomly after build and before tests
---
 .github/workflows/api-test.yml        | 4 ++--
 .github/workflows/backend.yml         | 3 ++-
 .github/workflows/e2e.yml             | 6 +++---
 .github/workflows/publish-docker.yaml | 5 ++---
 .github/workflows/unit-test.yml       | 3 ++-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/api-test.yml b/.github/workflows/api-test.yml
index 3de6dcdc7d..982524b011 100644
--- a/.github/workflows/api-test.yml
+++ b/.github/workflows/api-test.yml
@@ -60,7 +60,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
           restore-keys: ${{ runner.os }}-maven-
       - name: Build Image
         run: |
@@ -112,7 +112,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
           restore-keys: ${{ runner.os }}-maven-
       - uses: actions/download-artifact@v2
         name: Download Docker Images
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index ee27ed5e70..d4fb0ac10d 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -75,7 +75,8 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven
+          key: ${{ runner.os }}-maven-backend
+          restore-keys: ${{ runner.os }}-maven-
       - name: Build and Package on ${{ matrix.java }}
         run: |
           ./mvnw -B clean install \
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index be46f4fb48..13c878dee7 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -60,7 +60,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
           restore-keys: ${{ runner.os }}-maven-
       - name: Build Image
         run: |
@@ -130,7 +130,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
           restore-keys: ${{ runner.os }}-maven-
       - uses: actions/download-artifact@v2
         name: Download Docker Images
@@ -174,7 +174,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
           restore-keys: ${{ runner.os }}-maven-
       - uses: actions/download-artifact@v2
         name: Download Docker Images
diff --git a/.github/workflows/publish-docker.yaml 
b/.github/workflows/publish-docker.yaml
index 0ed0b99149..06aa8c6950 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -38,9 +38,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-docker
+          restore-keys: ${{ runner.os }}-maven-
       - name: Set environment variables
         run: |
           if [[ ${{ github.event_name }} == "release" ]]; then
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 487b0e5ce9..650d23f612 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -72,7 +72,8 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven
+          key: ${{ runner.os }}-maven-unit-test
+          restore-keys: ${{ runner.os }}-maven-
 
       - name: Run Unit tests
         run: ./mvnw clean verify -B -Dmaven.test.skip=false 
-Dspotless.skip=true

Reply via email to