From 6d9912632352fdd93b53897affa42b88c0ba17af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:47:30 +0000 Subject: [PATCH 1/5] Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-pr.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index c04f4adb8..6361f9753 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -60,7 +60,7 @@ jobs: uses: actions/checkout@v4 - name: Retrieve overview reports - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: logs path: _logs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c35a81ec1..c34ae7b79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: uses: actions/checkout@v4 - name: Retrieve overview reports - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: logs path: _logs From a788eb6824d629f932753706517c80dee4c855e2 Mon Sep 17 00:00:00 2001 From: Adonais Romero Gonzalez Date: Tue, 24 Sep 2024 16:09:48 -0700 Subject: [PATCH 2/5] Bump related actions/upload-artifact from 3 to 4 --- .github/workflows/ci-pr.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 6361f9753..fb15cfd76 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -44,7 +44,7 @@ jobs: WDS_ReportFileName: _overview.${{ matrix.configuration }}.${{ matrix.platform }} - name: Archive build logs and overview build reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: logs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c34ae7b79..478a01ef6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: WDS_ReportFileName: _overview.${{ matrix.configuration }}.${{ matrix.platform }} - name: Archive build logs and overview build reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: logs From 1a5dd880e816e8c9b77a7e833e7cbcb0f9e7b9bf Mon Sep 17 00:00:00 2001 From: Adonais Romero Gonzalez Date: Tue, 24 Sep 2024 16:11:32 -0700 Subject: [PATCH 3/5] Bump more actions/upload-artifact instances --- .github/workflows/ci-pr.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index fb15cfd76..361fa8bdb 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -69,7 +69,7 @@ jobs: run: .\.github\scripts\Join-CsvReports.ps1 - name: Archive global overview build reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: logs path: _logs/_overview.all.* diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 478a01ef6..1a4341a0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: run: .\.github\scripts\Join-CsvReports.ps1 - name: Archive global overview build reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: logs path: _logs/_overview.all.* From e32289fdb3b5f4f0d63df4afe50c21c3bd9df3ce Mon Sep 17 00:00:00 2001 From: Adonais Romero Gonzalez Date: Tue, 24 Sep 2024 16:12:51 -0700 Subject: [PATCH 4/5] Use more general v4 for actions/download-artifact --- .github/workflows/ci-pr.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 361fa8bdb..35ce6aaa1 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -60,7 +60,7 @@ jobs: uses: actions/checkout@v4 - name: Retrieve overview reports - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: logs path: _logs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a4341a0d..a213a7ac3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: uses: actions/checkout@v4 - name: Retrieve overview reports - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: logs path: _logs From bd6383bc2358044f4bce3f1ec10a5a25b659f7c8 Mon Sep 17 00:00:00 2001 From: Adonais Romero Gonzalez Date: Tue, 24 Sep 2024 16:30:26 -0700 Subject: [PATCH 5/5] Change parameters to fix artifact name conflict issues --- .github/workflows/ci-pr.yml | 5 +++-- .github/workflows/ci.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 35ce6aaa1..a87b7523e 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -47,7 +47,7 @@ jobs: uses: actions/upload-artifact@v4 if: always() with: - name: logs + name: logs-${{ matrix.configuration }}-${{ matrix.platform }} path: _logs report: @@ -62,8 +62,9 @@ jobs: - name: Retrieve overview reports uses: actions/download-artifact@v4 with: - name: logs path: _logs + pattern: logs-* + merge-multiple: true - name: Join and generate global reports run: .\.github\scripts\Join-CsvReports.ps1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a213a7ac3..2ad5b87d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: uses: actions/upload-artifact@v4 if: always() with: - name: logs + name: logs-${{ matrix.configuration }}-${{ matrix.platform }} path: _logs report: @@ -54,8 +54,9 @@ jobs: - name: Retrieve overview reports uses: actions/download-artifact@v4 with: - name: logs path: _logs + pattern: logs-* + merge-multiple: true - name: Join and generate global reports run: .\.github\scripts\Join-CsvReports.ps1