From d0bec77f30ab1a72dbe1f504a107efe37eeb2760 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Thu, 12 Dec 2024 09:45:09 +0800 Subject: [PATCH 1/2] Replace matrix id with job id --- .github/workflows/build-and-test-pr.yml | 4 ++-- .github/workflows/build-and-test-scheduled-3.1.yml | 4 ++-- .github/workflows/build-and-test-scheduled-3.2.yml | 4 ++-- .github/workflows/build-and-test-scheduled-3.3.yml | 4 ++-- .github/workflows/release-test.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index fd2560825ab..44a6a7bdd9e 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -342,7 +342,7 @@ jobs: - name: "Upload jacoco" uses: actions/upload-artifact@v4 with: - name: samples-jacoco-result-${{matrix.job_id}} + name: samples-jacoco-result-${{job.container.id}} path: target/jacoco*.exec - name: "Upload test result" if: always() @@ -445,7 +445,7 @@ jobs: - name: "Upload jacoco" uses: actions/upload-artifact@v4 with: - name: jacoco-result-${{matrix.job_id}} + name: jacoco-result-${{job.container.id}} path: target/jacoco*.exec - name: "Upload test result" if: always() diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index e237f428a87..e83cdd6fa28 100644 --- 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-${{job.container.id}} path: test/jobs/*-result* samples-test-result: needs: [samples-test-job] @@ -396,7 +396,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: integration-test-result-${{matrix.job_id}} + name: integration-test-result-${{job.container.id}} path: test/jobs/*-result* integration-test-result: needs: [integration-test-job] diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 370ce6d3b00..3acc87087db 100644 --- 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-${{job.container.id}} path: test/jobs/*-result* samples-test-result: needs: [samples-test-job] @@ -396,7 +396,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: integration-test-result-${{matrix.job_id}} + name: integration-test-result-${{job.container.id}} path: test/jobs/*-result* integration-test-result: needs: [integration-test-job] diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml index 76fc28eeb4b..0e75cc818f3 100644 --- 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-${{job.container.id}} path: test/jobs/*-result* samples-test-result: needs: [samples-test-job] @@ -396,7 +396,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: integration-test-result-${{matrix.job_id}} + name: integration-test-result-${{job.container.id}} path: test/jobs/*-result* integration-test-result: needs: [integration-test-job] diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index 4895593e9a7..a844c4af507 100644 --- 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-${{job.container.id}} path: test/jobs/*-result* samples-test-result: needs: [samples-test-job] @@ -393,7 +393,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: integration-test-result-${{matrix.job_id}} + name: integration-test-result-${{job.container.id}} path: test/jobs/*-result* integration-test-result: needs: [integration-test-job] From 064c0474c063f7a5dff3264874d4676fd82da414 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Thu, 12 Dec 2024 11:16:39 +0800 Subject: [PATCH 2/2] Replace matrix id with job id --- .github/workflows/build-and-test-pr.yml | 4 ++-- .github/workflows/build-and-test-scheduled-3.1.yml | 4 ++-- .github/workflows/build-and-test-scheduled-3.2.yml | 4 ++-- .github/workflows/build-and-test-scheduled-3.3.yml | 4 ++-- .github/workflows/release-test.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 44a6a7bdd9e..fd2560825ab 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -342,7 +342,7 @@ jobs: - name: "Upload jacoco" uses: actions/upload-artifact@v4 with: - name: samples-jacoco-result-${{job.container.id}} + name: samples-jacoco-result-${{matrix.job_id}} path: target/jacoco*.exec - name: "Upload test result" if: always() @@ -445,7 +445,7 @@ jobs: - name: "Upload jacoco" uses: actions/upload-artifact@v4 with: - name: jacoco-result-${{job.container.id}} + name: jacoco-result-${{matrix.job_id}} path: target/jacoco*.exec - name: "Upload test result" if: always() diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index e83cdd6fa28..4f83eb6132d 100644 --- 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-${{job.container.id}} + name: samples-test-result-${{matrix.job_id}}-${{matrix.jdk}} path: test/jobs/*-result* samples-test-result: needs: [samples-test-job] @@ -396,7 +396,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: integration-test-result-${{job.container.id}} + name: integration-test-result-${{matrix.job_id}}-${{matrix.jdk}} path: test/jobs/*-result* integration-test-result: needs: [integration-test-job] diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 3acc87087db..246fc73f94a 100644 --- 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-${{job.container.id}} + name: samples-test-result-${{matrix.job_id}}-${{matrix.jdk}} path: test/jobs/*-result* samples-test-result: needs: [samples-test-job] @@ -396,7 +396,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: integration-test-result-${{job.container.id}} + name: integration-test-result-${{matrix.job_id}}-${{matrix.jdk}} path: test/jobs/*-result* integration-test-result: needs: [integration-test-job] diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml index 0e75cc818f3..7e2cb8e49b0 100644 --- 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-${{job.container.id}} + name: samples-test-result-${{matrix.job_id}}-${{matrix.jdk}} path: test/jobs/*-result* samples-test-result: needs: [samples-test-job] @@ -396,7 +396,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: integration-test-result-${{job.container.id}} + name: integration-test-result-${{matrix.job_id}}-${{matrix.jdk}} path: test/jobs/*-result* integration-test-result: needs: [integration-test-job] diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index a844c4af507..11edc35a677 100644 --- 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-${{job.container.id}} + name: samples-test-result-${{matrix.job_id}}-${{matrix.jdk}} path: test/jobs/*-result* samples-test-result: needs: [samples-test-job] @@ -393,7 +393,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: integration-test-result-${{job.container.id}} + name: integration-test-result-${{matrix.job_id}}-${{matrix.jdk}} path: test/jobs/*-result* integration-test-result: needs: [integration-test-job]