Replace upload artifact results (#15025)

apache · Dec 27, 2024 · 0fd3706 · 0fd3706
1 parent a8b53a2
commit 0fd3706
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml
@@ -297,7 +297,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: samples-test-result-${{matrix.job_id}}
+          name: samples-test-result-${{matrix.jdk}}-${{matrix.job_id}}
           path: test/jobs/*-result*
   samples-test-result:
     needs: [samples-test-job]
@@ -316,7 +316,7 @@ jobs:
       - name: "Download test result"
         uses: actions/download-artifact@v4
         with:
-          name: samples-test-result-*
+          name: samples-test-result-${{matrix.jdk}}-*
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: test/jobs/
       - name: "Merge test result"
@@ -396,7 +396,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: integration-test-result-${{matrix.job_id}}
+          name: integration-test-result-${{matrix.jdk}}-${{matrix.job_id}}
           path: test/jobs/*-result*
   integration-test-result:
     needs: [integration-test-job]
@@ -415,7 +415,7 @@ jobs:
       - name: "Download test result"
         uses: actions/download-artifact@v4
         with:
-          name: integration-test-result-*
+          name: integration-test-result-${{matrix.jdk}}-*
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: test/jobs/
       - name: "Merge test result"

diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml
@@ -297,7 +297,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: samples-test-result-${{matrix.job_id}}
+          name: samples-test-result-${{matrix.jdk}}-${{matrix.job_id}}
           path: test/jobs/*-result*
   samples-test-result:
     needs: [samples-test-job]
@@ -316,7 +316,7 @@ jobs:
       - name: "Download test result"
         uses: actions/download-artifact@v4
         with:
-          name: samples-test-result-*
+          name: samples-test-result-${{matrix.jdk}}-*
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: test/jobs/
       - name: "Merge test result"
@@ -396,7 +396,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: integration-test-result-${{matrix.job_id}}
+          name: integration-test-result-${{matrix.jdk}}-${{matrix.job_id}}
           path: test/jobs/*-result*
   integration-test-result:
     needs: [integration-test-job]
@@ -415,7 +415,7 @@ jobs:
       - name: "Download test result"
         uses: actions/download-artifact@v4
         with:
-          name: integration-test-result-*
+          name: integration-test-result-${{matrix.jdk}}-*
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: test/jobs/
       - name: "Merge test result"

diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml
@@ -297,7 +297,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: samples-test-result-${{matrix.job_id}}
+          name: samples-test-result-${{matrix.jdk}}-${{matrix.job_id}}
           path: test/jobs/*-result*
   samples-test-result:
     needs: [samples-test-job]
@@ -316,7 +316,7 @@ jobs:
       - name: "Download test result"
         uses: actions/download-artifact@v4
         with:
-          name: samples-test-result-*
+          name: samples-test-result-${{matrix.jdk}}-*
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: test/jobs/
       - name: "Merge test result"
@@ -396,7 +396,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: integration-test-result-${{matrix.job_id}}
+          name: integration-test-result-${{matrix.jdk}}-${{matrix.job_id}}
           path: test/jobs/*-result*
   integration-test-result:
     needs: [integration-test-job]
@@ -415,7 +415,7 @@ jobs:
       - name: "Download test result"
         uses: actions/download-artifact@v4
         with:
-          name: integration-test-result-*
+          name: integration-test-result-${{matrix.jdk}}-*
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: test/jobs/
       - name: "Merge test result"

diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -294,7 +294,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: samples-test-result-${{matrix.job_id}}
+          name: samples-test-result-${{matrix.jdk}}-${{matrix.job_id}}
           path: test/jobs/*-result*
   samples-test-result:
     needs: [samples-test-job]
@@ -313,7 +313,7 @@ jobs:
       - name: "Download test result"
         uses: actions/download-artifact@v4
         with:
-          name: samples-test-result-*
+          name: samples-test-result-${{matrix.jdk}}-*
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: test/jobs/
       - name: "Merge test result"
@@ -393,7 +393,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: integration-test-result-${{matrix.job_id}}
+          name: integration-test-result-${{matrix.jdk}}-${{matrix.job_id}}
           path: test/jobs/*-result*
   integration-test-result:
     needs: [integration-test-job]
@@ -412,7 +412,7 @@ jobs:
       - name: "Download test result"
         uses: actions/download-artifact@v4
         with:
-          name: integration-test-result-*
+          name: integration-test-result-${{matrix.jdk}}-*
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: test/jobs/
       - name: "Merge test result"