From 387f2c52e65ef48ea734fbfdfa34f2e28d3493fb Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 15 Oct 2024 15:47:27 +0100 Subject: [PATCH] DEV: Fix github workflow yaml syntax (#29217) Followup to ec75c442db6c4817d702cfdf8279a22bbfcaea86 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 01f300c7cef..5227d0cb057 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -409,7 +409,7 @@ jobs: name: ember-exam-execution-${{ matrix.browser }}-${{ hashFiles('./app/assets/javascripts/discourse/test-execution-*.json') }} path: ./app/assets/javascripts/discourse/test-execution-*.json - merge: + merge: if: github.repository == 'discourse/discourse' && github.ref == 'refs/heads/main' runs-on: debian-12 needs: build