From 4757d2195bb960201696fd1fd85bbda10b729e9b Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Wed, 15 Jan 2025 13:59:20 +0100 Subject: [PATCH 1/7] Fix merge reports after tests --- .github/actions/combineReportsFromE2E/action.yml | 2 +- .github/actions/e2e/action.yml | 2 +- .github/actions/testmo/testmo-threads-submit/action.yml | 2 +- .github/workflows/pr-automation.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/combineReportsFromE2E/action.yml b/.github/actions/combineReportsFromE2E/action.yml index cc4f715332c..b90d1410860 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 f92d3553d87..140505b95d3 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 diff --git a/.github/workflows/pr-automation.yml b/.github/workflows/pr-automation.yml index 059ff689fc1..34de96d57d2 100644 --- a/.github/workflows/pr-automation.yml +++ b/.github/workflows/pr-automation.yml @@ -300,7 +300,7 @@ jobs: run: npx playwright test --shard ${{ matrix.shard }} - name: Upload blob report to GitHub Actions Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: all-blob-reports @@ -330,7 +330,7 @@ jobs: run: npx playwright merge-reports --reporter html ./all-blob-reports - name: Upload HTML report - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: html-report--attempt-${{ github.run_attempt }} path: playwright-report From ddd7e9f7bf8341813807e9966fd88c44d48e5b7a Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Wed, 15 Jan 2025 14:26:16 +0100 Subject: [PATCH 2/7] Add workflow for testing purpose --- .github/workflows/test-changes-in-workflow.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/test-changes-in-workflow.yml diff --git a/.github/workflows/test-changes-in-workflow.yml b/.github/workflows/test-changes-in-workflow.yml new file mode 100644 index 00000000000..586535ee4c1 --- /dev/null +++ b/.github/workflows/test-changes-in-workflow.yml @@ -0,0 +1,11 @@ +name: Run automation tests on release +on: + push + +jobs: + run-tests-on-release: + uses: ./.github/workflows/run-tests-on-release.yml + with: + VERSION: "3.18" # eg. "3.19" + CUSTOM_VERSION: "3.18.test-run" # eg. "3.19.4-5a41d18" + secrets: inherit \ No newline at end of file From 94433f520df1b60c0c86476c5f2abbb9be1f2956 Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Wed, 15 Jan 2025 15:00:51 +0100 Subject: [PATCH 3/7] Remove workflow for testing changes, add changeset --- .changeset/brown-pumas-judge.md | 5 +++++ .github/workflows/test-changes-in-workflow.yml | 11 ----------- 2 files changed, 5 insertions(+), 11 deletions(-) create mode 100644 .changeset/brown-pumas-judge.md delete mode 100644 .github/workflows/test-changes-in-workflow.yml 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/workflows/test-changes-in-workflow.yml b/.github/workflows/test-changes-in-workflow.yml deleted file mode 100644 index 586535ee4c1..00000000000 --- a/.github/workflows/test-changes-in-workflow.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Run automation tests on release -on: - push - -jobs: - run-tests-on-release: - uses: ./.github/workflows/run-tests-on-release.yml - with: - VERSION: "3.18" # eg. "3.19" - CUSTOM_VERSION: "3.18.test-run" # eg. "3.19.4-5a41d18" - secrets: inherit \ No newline at end of file From 49f625fcc00dbb204177dd463ce0d4f2f7adcc07 Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Fri, 17 Jan 2025 11:45:06 +0100 Subject: [PATCH 4/7] Update download-artifact v3 to v4 --- .github/actions/combineReportsFromE2E/action.yml | 2 +- .github/actions/testmo/testmo-threads-submit/action.yml | 2 +- .github/workflows/pr-automation.yml | 2 +- .github/workflows/run-test-manual.yml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/combineReportsFromE2E/action.yml b/.github/actions/combineReportsFromE2E/action.yml index b90d1410860..0030faa7481 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 140505b95d3..0bae9e20a91 100644 --- a/.github/actions/testmo/testmo-threads-submit/action.yml +++ b/.github/actions/testmo/testmo-threads-submit/action.yml @@ -51,7 +51,7 @@ runs: TESTMO_TOKEN: ${{ inputs.testmoToken }} TESTMO_RUN_ID: ${{ inputs.testmoRunId}} - 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/workflows/pr-automation.yml b/.github/workflows/pr-automation.yml index 34de96d57d2..674a9a58c7e 100644 --- a/.github/workflows/pr-automation.yml +++ b/.github/workflows/pr-automation.yml @@ -321,7 +321,7 @@ jobs: run: npm ci - name: Download blob reports from GitHub Actions Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: all-blob-reports path: all-blob-reports diff --git a/.github/workflows/run-test-manual.yml b/.github/workflows/run-test-manual.yml index 067378ecdc7..361ef8dfadc 100644 --- a/.github/workflows/run-test-manual.yml +++ b/.github/workflows/run-test-manual.yml @@ -41,6 +41,8 @@ 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 + echo "BASE_URL=https://v318.staging.saleor.cloud/dashboard/" >> $GITHUB_OUTPUT + echo "API_URL=https://v318.staging.saleor.cloud/graphql/" >> $GITHUB_OUTPUT - uses: ./.github/actions/testmo/testmo-init From cf035dce8d9543c77677e6cb3b10d7a6549b1577 Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Fri, 17 Jan 2025 12:50:21 +0100 Subject: [PATCH 5/7] remove uploading artifact from testmo action --- .../testmo/testmo-threads-submit/action.yml | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/.github/actions/testmo/testmo-threads-submit/action.yml b/.github/actions/testmo/testmo-threads-submit/action.yml index 0bae9e20a91..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@v4 - 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 From d4e29c5b579057f772a8046ffb4d502e0de5dec9 Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Fri, 17 Jan 2025 13:09:46 +0100 Subject: [PATCH 6/7] Remove variables for workflow testing purposes --- .github/workflows/run-test-manual.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/run-test-manual.yml b/.github/workflows/run-test-manual.yml index 361ef8dfadc..84ba7d2b63e 100644 --- a/.github/workflows/run-test-manual.yml +++ b/.github/workflows/run-test-manual.yml @@ -41,9 +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 - echo "BASE_URL=https://v318.staging.saleor.cloud/dashboard/" >> $GITHUB_OUTPUT - echo "API_URL=https://v318.staging.saleor.cloud/graphql/" >> $GITHUB_OUTPUT - - uses: ./.github/actions/testmo/testmo-init with: From 39d4ffc1165e59fa42687e50b53221c9eb21979f Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Fri, 17 Jan 2025 13:15:17 +0100 Subject: [PATCH 7/7] add changesets --- .changeset/lazy-actors-enjoy.md | 5 +++++ 1 file changed, 5 insertions(+) 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