diff --git a/.changeset/dirty-toes-tan.md b/.changeset/dirty-toes-tan.md new file mode 100644 index 00000000000..6f73247acc1 --- /dev/null +++ b/.changeset/dirty-toes-tan.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 deleted file mode 100644 index cc4f715332c..00000000000 --- a/.github/actions/combineReportsFromE2E/action.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: combine-e2e-results -description: "Combines reports from matrix and upload them as one" -runs: - using: "composite" - steps: - - uses: actions/setup-node@v3 - with: - node-version-file: ".nvmrc" - cache: npm - - name: Cache node modules - uses: actions/cache@v3 - env: - cache-name: cache-node-modules - with: - path: ~/.npm - key: ${{ runner.os }}-qa-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-qa-${{ env.cache-name }}- - ${{ runner.os }}-qa- - ${{ runner.os }}- - - name: Install Dependencies - if: steps.cache-node-modules.outputs.cache-hit != 'true' - shell: bash - run: NODE_OPTIONS=--max_old_space_size=4096 npm ci - - run: npm ci - shell: bash - working-directory: .github/workflows - - name: Download reports artifacts - uses: actions/download-artifact@v3 - with: - path: ./cypress/reports - - name: Create reports dir - shell: bash - continue-on-error: true - run: npm run qa:create-artifacts-dirs - - name: Merge report files - shell: bash - continue-on-error: true - run: npm run qa:generate-html-report - - name: Move artifacts screenshots into reports dir - shell: bash - continue-on-error: true - run: npm run qa:artifact-move-screenshots - - name: Upload reports - uses: actions/upload-artifact@v3 - if: always() - with: - name: combined-report - path: ./cypress/reports - retention-days: 5 - if-no-files-found: ignore diff --git a/.github/actions/merge-pw-reports/action.yml b/.github/actions/merge-pw-reports/action.yml index b646a9fe3f8..46f2b1b56c7 100644 --- a/.github/actions/merge-pw-reports/action.yml +++ b/.github/actions/merge-pw-reports/action.yml @@ -13,17 +13,18 @@ runs: 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 + pattern: all-blob-reports-* + merge-multiple: true - name: Merge into HTML Report shell: bash 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 diff --git a/.github/actions/run-pw-tests/action.yml b/.github/actions/run-pw-tests/action.yml index 82f6abfd032..d2d28697525 100644 --- a/.github/actions/run-pw-tests/action.yml +++ b/.github/actions/run-pw-tests/action.yml @@ -77,12 +77,14 @@ runs: URL_TO_RUN: ${{ inputs.URL_TO_RUN }} WORKERS: ${{ inputs.PW_WORKERS }} RETRIES: ${{ inputs.PW_RETRIES }} - run: npm run qa:pw-e2e -- --shard "$SHARD_NUMBER" + run: | + echo "reportName=all-blob-reports-${SHARD_NUMBER%%/*}" >> $GITHUB_ENV + npm run qa:pw-e2e -- --shard "$SHARD_NUMBER" - 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 + name: ${{ env.reportName }} path: blob-report retention-days: 1 \ No newline at end of file