From c38980e82c0be073ca1a5e229ad8677faf5dbc31 Mon Sep 17 00:00:00 2001 From: Ian Stevenson Date: Fri, 5 Jun 2020 11:56:05 +1000 Subject: [PATCH 1/2] CI: Upgrade GHA artefact upload action Version 2 is now out of preview and has some fixes, so time to start using the official release. --- .github/workflows/ci.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2ccf987b92..1669381307 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -113,7 +113,7 @@ jobs: target/*.zip - name: Save primary artefacts - uses: actions/upload-artifact@v2-preview + uses: actions/upload-artifact@v2 with: name: Artefacts path: artefacts.tar @@ -134,7 +134,7 @@ jobs: ./gradlew build - name: Save primary artefacts - uses: actions/upload-artifact@v2-preview + uses: actions/upload-artifact@v2 with: name: ImportExportTools path: import-export-tool/build/libs/ @@ -219,7 +219,7 @@ jobs: - name: Save Scalacheck results if: matrix.newui && failure() - uses: actions/upload-artifact@v2-preview + uses: actions/upload-artifact@v2 with: name: ScalacheckReports path: autotest/Tests/target/test-reports @@ -231,21 +231,21 @@ jobs: - name: Save TestNG Reports if: failure() - uses: actions/upload-artifact@v2-preview + uses: actions/upload-artifact@v2 with: name: TestNGReports-new-${{ matrix.newui }} path: autotest/OldTests/target/testng - name: Save oEQ Logs if: failure() - uses: actions/upload-artifact@v2-preview + uses: actions/upload-artifact@v2 with: name: oEQLogs-new-${{ matrix.newui }} path: autotest/equella-install/logs - name: Save Screenshots if: failure() - uses: actions/upload-artifact@v2-preview + uses: actions/upload-artifact@v2 with: name: Screenshots-new-${{ matrix.newui }} path: autotest/Tests/target/test-reports/screenshots @@ -256,7 +256,7 @@ jobs: coverageReport - name: Save Coverage Report - uses: actions/upload-artifact@v2-preview + uses: actions/upload-artifact@v2 with: name: CoverageReport-newui-${{ matrix.newui }} path: autotest/target/coverage-report/ From 5ea5ae756c3db33c57d62d5d1ed4e04f32410d57 Mon Sep 17 00:00:00 2001 From: Ian Stevenson Date: Wed, 10 Jun 2020 09:25:06 +1000 Subject: [PATCH 2/2] CI: Upgrade GHA artefact upload action - 2.0.1 Version 2.0.1 contains a fix and logic change for when uploads fail - which is a main issue we're having. --- .github/workflows/ci.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1669381307..ecaf24d7e8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -113,7 +113,7 @@ jobs: target/*.zip - name: Save primary artefacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2.0.1 with: name: Artefacts path: artefacts.tar @@ -134,7 +134,7 @@ jobs: ./gradlew build - name: Save primary artefacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2.0.1 with: name: ImportExportTools path: import-export-tool/build/libs/ @@ -219,7 +219,7 @@ jobs: - name: Save Scalacheck results if: matrix.newui && failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2.0.1 with: name: ScalacheckReports path: autotest/Tests/target/test-reports @@ -231,21 +231,21 @@ jobs: - name: Save TestNG Reports if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2.0.1 with: name: TestNGReports-new-${{ matrix.newui }} path: autotest/OldTests/target/testng - name: Save oEQ Logs if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2.0.1 with: name: oEQLogs-new-${{ matrix.newui }} path: autotest/equella-install/logs - name: Save Screenshots if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2.0.1 with: name: Screenshots-new-${{ matrix.newui }} path: autotest/Tests/target/test-reports/screenshots @@ -256,7 +256,7 @@ jobs: coverageReport - name: Save Coverage Report - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2.0.1 with: name: CoverageReport-newui-${{ matrix.newui }} path: autotest/target/coverage-report/