From ae6d0a969074d02719a3aa61aa9b965cca9acc68 Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Thu, 16 Jan 2025 11:03:43 +0100 Subject: [PATCH 1/2] Fix merge reports after tests --- .changeset/brown-pumas-judge.md | 5 +++++ .github/actions/combineReportsFromE2E/action.yml | 2 +- .github/actions/e2e/action.yml | 2 +- .github/actions/testmo/testmo-threads-submit/action.yml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .changeset/brown-pumas-judge.md diff --git a/.changeset/brown-pumas-judge.md b/.changeset/brown-pumas-judge.md new file mode 100644 index 00000000000..6f73247acc1 --- /dev/null +++ b/.changeset/brown-pumas-judge.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": patch +--- + +Now CI workflows use updated action to upload and download artifacts diff --git a/.github/actions/combineReportsFromE2E/action.yml b/.github/actions/combineReportsFromE2E/action.yml index e7863af371b..c6a01783b8b 100644 --- a/.github/actions/combineReportsFromE2E/action.yml +++ b/.github/actions/combineReportsFromE2E/action.yml @@ -42,7 +42,7 @@ runs: continue-on-error: true run: npm run qa:artifact-move-screenshots - name: Upload reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: combined-report diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml index 0bb2a4363f0..19853cde0d0 100644 --- a/.github/actions/e2e/action.yml +++ b/.github/actions/e2e/action.yml @@ -87,7 +87,7 @@ runs: if: ${{ ! cancelled() }} run: npm run qa:move-screenshots - name: Upload reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: report-${{ strategy.job-index }} diff --git a/.github/actions/testmo/testmo-threads-submit/action.yml b/.github/actions/testmo/testmo-threads-submit/action.yml index 516512bce58..ed8e1f99e6a 100644 --- a/.github/actions/testmo/testmo-threads-submit/action.yml +++ b/.github/actions/testmo/testmo-threads-submit/action.yml @@ -67,7 +67,7 @@ runs: shell: bash run: npm run qa:artifact-move-screenshots - name: Upload reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: combined-report From 7f19355dff2553b7dace58247e15cde27787bc5d Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Mon, 20 Jan 2025 12:08:56 +0100 Subject: [PATCH 2/2] Fix merge reports after tests --- .changeset/lazy-actors-enjoy.md | 5 ++++ .../actions/combineReportsFromE2E/action.yml | 2 +- .../testmo/testmo-threads-submit/action.yml | 24 ------------------- .github/workflows/run-test-manual.yml | 1 - 4 files changed, 6 insertions(+), 26 deletions(-) create mode 100644 .changeset/lazy-actors-enjoy.md diff --git a/.changeset/lazy-actors-enjoy.md b/.changeset/lazy-actors-enjoy.md new file mode 100644 index 00000000000..6f73247acc1 --- /dev/null +++ b/.changeset/lazy-actors-enjoy.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": patch +--- + +Now CI workflows use updated action to upload and download artifacts diff --git a/.github/actions/combineReportsFromE2E/action.yml b/.github/actions/combineReportsFromE2E/action.yml index c6a01783b8b..16aeffebb20 100644 --- a/.github/actions/combineReportsFromE2E/action.yml +++ b/.github/actions/combineReportsFromE2E/action.yml @@ -26,7 +26,7 @@ runs: shell: bash working-directory: .github/workflows - name: Download reports artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: ./cypress/reports - name: Create reports dir diff --git a/.github/actions/testmo/testmo-threads-submit/action.yml b/.github/actions/testmo/testmo-threads-submit/action.yml index ed8e1f99e6a..474a1249b4a 100644 --- a/.github/actions/testmo/testmo-threads-submit/action.yml +++ b/.github/actions/testmo/testmo-threads-submit/action.yml @@ -50,27 +50,3 @@ runs: TESTMO_URL: ${{ inputs.testmoUrl }} TESTMO_TOKEN: ${{ inputs.testmoToken }} TESTMO_RUN_ID: ${{ inputs.testmoRunId}} - - name: Download reports artifacts - uses: actions/download-artifact@v3 - with: - path: ./cypress/reports - - name: Create reports dir - continue-on-error: true - shell: bash - run: npm run qa:create-artifacts-dirs - - name: Merge report files - continue-on-error: true - shell: bash - run: npm run qa:generate-html-report - - name: Move artifacts screenshots into reports dir - continue-on-error: true - shell: bash - run: npm run qa:artifact-move-screenshots - - name: Upload reports - uses: actions/upload-artifact@v4 - if: always() - with: - name: combined-report - path: ./cypress/reports - retention-days: 5 - if-no-files-found: ignore \ No newline at end of file diff --git a/.github/workflows/run-test-manual.yml b/.github/workflows/run-test-manual.yml index 067378ecdc7..84ba7d2b63e 100644 --- a/.github/workflows/run-test-manual.yml +++ b/.github/workflows/run-test-manual.yml @@ -41,7 +41,6 @@ jobs: VERSION_SLUG=$(echo "${CURRENT_BRANCH}" | sed "s/\.//") echo "BASE_URL=https://v${VERSION_SLUG}.staging.saleor.cloud/dashboard/" >> $GITHUB_OUTPUT echo "API_URL=https://v${VERSION_SLUG}.staging.saleor.cloud/graphql/" >> $GITHUB_OUTPUT - - uses: ./.github/actions/testmo/testmo-init with: