From da79086da50f1ec521c07178dd4016c720de1d9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:44:20 +0000 Subject: [PATCH 1/4] build(deps): bump actions/download-artifact 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.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8746f99232..a83e246285 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -236,7 +236,7 @@ jobs: node-version-file: '.nvmrc' - name: Download Artefacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: path: Artefacts name: Artefacts @@ -356,7 +356,7 @@ jobs: node-version-file: '.nvmrc' - name: Download installer - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: path: Artefacts name: Artefacts From dc6797d08dbab63a9b22f3fe3e36834621e92bca Mon Sep 17 00:00:00 2001 From: Ian Stevenson Date: Wed, 4 Sep 2024 10:36:30 +1000 Subject: [PATCH 2/4] build(deps): bump actions/upload-artifact from 3 to 4.4.0 Upload artifact must have the same major version as download artifcat. --- .github/workflows/ci.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a83e246285..b50cea4bd4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -123,7 +123,7 @@ jobs: target/*.zip - name: Save primary artefacts - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.4.0 with: name: Artefacts path: artefacts.tar @@ -174,7 +174,7 @@ jobs: tar cvf storybook.tar storybook-static - name: Save Static Storybook instance - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.4.0 with: name: Storybook path: react-front-end/storybook.tar @@ -263,7 +263,7 @@ jobs: - name: Save Scalacheck results if: matrix.newui && failure() - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.4.0 with: name: ScalacheckReports path: autotest/Tests/target/test-reports @@ -274,21 +274,21 @@ jobs: - name: Save TestNG Reports if: failure() - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.4.0 with: name: TestNGReports-new-${{ matrix.newui }} path: autotest/OldTests/target/testng - name: Save oEQ Logs if: failure() - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.4.0 with: name: oEQLogs-new-${{ matrix.newui }} path: autotest/equella-install/logs - name: Save Screenshots if: failure() - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.4.0 with: name: Screenshots-new-${{ matrix.newui }} path: autotest/Tests/target/test-reports/screenshots @@ -305,7 +305,7 @@ jobs: tar cvf coverage_report.tar autotest/target/coverage-report/ - name: Save Coverage Report - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.4.0 with: name: CoverageReport-newui-${{ matrix.newui }} path: coverage_report.tar @@ -387,7 +387,7 @@ jobs: - name: Save oEQ logs for REST Module if: failure() - uses: actions/upload-artifact@v3.1.3 + uses: actions/upload-artifact@v4.4.0 with: name: oEQ-logs-rest-module path: autotest/equella-install/logs From a3027ac2a8ce0600b7002b22e1774057d00d5dd8 Mon Sep 17 00:00:00 2001 From: Ian Stevenson Date: Thu, 5 Sep 2024 18:27:48 +1000 Subject: [PATCH 3/4] build(github): make sure artifacts have unique names The new actions/upload-artifact fails if you reuse names - arguably a good thing. --- .github/workflows/ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b50cea4bd4..42ade2f83a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -265,7 +265,7 @@ jobs: if: matrix.newui && failure() uses: actions/upload-artifact@v4.4.0 with: - name: ScalacheckReports + name: ScalacheckReports-${{ matrix.pgqs-image }} path: autotest/Tests/target/test-reports - name: Run TestNG tests @@ -276,21 +276,21 @@ jobs: if: failure() uses: actions/upload-artifact@v4.4.0 with: - name: TestNGReports-new-${{ matrix.newui }} + name: TestNGReports-new-${{ matrix.newui }}-${{ matrix.pgqs-image }} path: autotest/OldTests/target/testng - name: Save oEQ Logs if: failure() uses: actions/upload-artifact@v4.4.0 with: - name: oEQLogs-new-${{ matrix.newui }} + name: oEQLogs-new-${{ matrix.newui }}-${{ matrix.pgqs-image }} path: autotest/equella-install/logs - name: Save Screenshots if: failure() uses: actions/upload-artifact@v4.4.0 with: - name: Screenshots-new-${{ matrix.newui }} + name: Screenshots-new-${{ matrix.newui }}-${{ matrix.pgqs-image }} path: autotest/Tests/target/test-reports/screenshots - name: Generate coverage report @@ -307,7 +307,7 @@ jobs: - name: Save Coverage Report uses: actions/upload-artifact@v4.4.0 with: - name: CoverageReport-newui-${{ matrix.newui }} + name: CoverageReport-newui-${{ matrix.newui }}-${{ matrix.pgsql-image }} path: coverage_report.tar rest-module-testing: From 06a8660288a62c17032acfd0bc301c9a0f9a20f2 Mon Sep 17 00:00:00 2001 From: Ian Stevenson Date: Fri, 6 Sep 2024 10:41:22 +1000 Subject: [PATCH 4/4] build(github): unify artifact name suffix This way all artefacts will have a consistent suffix that should be unique across the matrix permutations. --- .github/workflows/ci.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 42ade2f83a..f60ce9e90a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -213,6 +213,7 @@ jobs: AUTOTEST_CONFIG: autotest/github-actions.conf EQ_EXIFTOOL_PATH: /usr/bin/exiftool OLD_TEST_NEWUI: ${{ matrix.newui }} + MATRIX_ID: ${{ matrix.newui && 'NEWUI' || 'OLDUI' }}-psql_${{ matrix.pgsql-image }} steps: - name: Install OS dependencies @@ -265,7 +266,7 @@ jobs: if: matrix.newui && failure() uses: actions/upload-artifact@v4.4.0 with: - name: ScalacheckReports-${{ matrix.pgqs-image }} + name: ScalacheckReports-${{ env.MATRIX_ID }} path: autotest/Tests/target/test-reports - name: Run TestNG tests @@ -276,21 +277,21 @@ jobs: if: failure() uses: actions/upload-artifact@v4.4.0 with: - name: TestNGReports-new-${{ matrix.newui }}-${{ matrix.pgqs-image }} + name: TestNGReports-${{ env.MATRIX_ID }} path: autotest/OldTests/target/testng - name: Save oEQ Logs if: failure() uses: actions/upload-artifact@v4.4.0 with: - name: oEQLogs-new-${{ matrix.newui }}-${{ matrix.pgqs-image }} + name: oEQLogs-${{ env.MATRIX_ID }} path: autotest/equella-install/logs - name: Save Screenshots if: failure() uses: actions/upload-artifact@v4.4.0 with: - name: Screenshots-new-${{ matrix.newui }}-${{ matrix.pgqs-image }} + name: Screenshots-${{ env.MATRIX_ID }} path: autotest/Tests/target/test-reports/screenshots - name: Generate coverage report @@ -307,7 +308,7 @@ jobs: - name: Save Coverage Report uses: actions/upload-artifact@v4.4.0 with: - name: CoverageReport-newui-${{ matrix.newui }}-${{ matrix.pgsql-image }} + name: CoverageReport-${{ env.MATRIX_ID }} path: coverage_report.tar rest-module-testing: