github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 10:57:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "DEV: Fix github workflow yaml syntax (#29217)" (#29218)

Browse Source 
This reverts commit 387f2c52e6.

Merging fails if there are no artifacts matching the pattern. Reverting while we work out a path forward
This commit is contained in:
David Taylor 2024-10-15 17:23:37 +01:00 committed by GitHub
parent 3ad2fd032b
commit d04fd3a8ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.github/workflows/tests.yml vendored
View File

@ -306,10 +306,10 @@ jobs:
shell: bash shell: bash
- name: Upload failed system test screenshots - name: Upload failed system test screenshots
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v3 # TODO (tgxworld): V4 doesn't allow us to upload multiple uploads to the same artifact name so keep at V3 for now.
if: always() && steps.check-failed-system-test-screenshots.outputs.exists == 'true' if: always() && steps.check-failed-system-test-screenshots.outputs.exists == 'true'
with: with:
name: failed-system-test-screenshots-${{ matrix.build_type }}-${{ matrix.target }} name: failed-system-test-screenshots
path: tmp/capybara/*.png path: tmp/capybara/*.png
- name: Check for flaky tests report - name: Check for flaky tests report
@ -335,10 +335,10 @@ jobs:
run: cp tmp/turbo_rspec_flaky_tests.json tmp/turbo_rspec_flaky_tests-${{ matrix.build_type }}-${{ matrix.target }}-${{ steps.fetch-job-id.outputs.job_id }}.json run: cp tmp/turbo_rspec_flaky_tests.json tmp/turbo_rspec_flaky_tests-${{ matrix.build_type }}-${{ matrix.target }}-${{ steps.fetch-job-id.outputs.job_id }}.json
- name: Upload flaky tests report - name: Upload flaky tests report
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v3 # TODO (tgxworld): V4 doesn't allow us to upload multiple uploads to the same artifact name so keep at V3 for now
if: always() && steps.check-flaky-spec-report.outputs.exists == 'true' if: always() && steps.check-flaky-spec-report.outputs.exists == 'true'
with: with:
name: flaky-test-reports-${{ matrix.build_type }}-${{ matrix.target }} name: flaky-test-reports
path: tmp/turbo_rspec_flaky_tests-${{ matrix.build_type }}-${{ matrix.target }}-${{ steps.fetch-job-id.outputs.job_id }}.json path: tmp/turbo_rspec_flaky_tests-${{ matrix.build_type }}-${{ matrix.target }}-${{ steps.fetch-job-id.outputs.job_id }}.json
- name: Check Annotations - name: Check Annotations
@ -408,24 +408,3 @@ jobs:
with: with:
name: ember-exam-execution-${{ matrix.browser }}-${{ hashFiles('./app/assets/javascripts/discourse/test-execution-*.json') }} name: ember-exam-execution-${{ matrix.browser }}-${{ hashFiles('./app/assets/javascripts/discourse/test-execution-*.json') }}
path: ./app/assets/javascripts/discourse/test-execution-*.json path: ./app/assets/javascripts/discourse/test-execution-*.json
merge:
if: github.repository == 'discourse/discourse' && github.ref == 'refs/heads/main'
runs-on: debian-12
needs: build
steps:
- name: Merge Artifacts
uses: actions/upload-artifact/merge@v4
with:
name: failed-system-test-screenshots
pattern: failed-system-test-screenshots-*
delete-merged: true
separate-directories: false
- name: Merge Artifacts
uses: actions/upload-artifact/merge@v4
with:
name: flaky-test-reports
pattern: flaky-test-reports-*
delete-merged: true
separate-directories: false