Skip to content

Commit 2bb31c4

Browse files
committed
ci: Make E2E tests required & check for PRs against master
1 parent d94a017 commit 2bb31c4

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
is_develop: ${{ github.ref == 'refs/heads/develop' }}
141141
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
142142
# When merging into master, or from master
143-
is_gitflow_sync: ${{ github.head_ref == 'refs/heads/master' || github.ref == 'refs/heads/master' }}
143+
is_gitflow_sync: ${{ github.head_ref == 'master' || github.ref == 'refs/heads/master' }}
144144
has_gitflow_label:
145145
${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }}
146146
force_skip_cache:
@@ -181,6 +181,21 @@ jobs:
181181
outputs:
182182
dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }}
183183

184+
job_check_branches:
185+
name: Check PR branches
186+
needs: job_get_metadata
187+
runs-on: ubuntu-20.04
188+
if: github.event_name == 'pull_request'
189+
permissions:
190+
pull-requests: write
191+
steps:
192+
- name: PR is opened against master
193+
uses: mshick/add-pr-comment@v2
194+
if: ${{ github.base_ref == 'master' && github.head_ref != 'develop' }}
195+
with:
196+
message: |
197+
⚠️ This PR is opened against **master**. You probably want to open it against **develop**.
198+
184199
job_build:
185200
name: Build
186201
needs: [job_get_metadata, job_install_deps]
@@ -709,6 +724,7 @@ jobs:
709724
job_browser_playwright_tests,
710725
job_browser_integration_tests,
711726
job_remix_integration_tests,
727+
job_e2e_tests,
712728
]
713729
# Always run this, even if a dependent job failed
714730
if: always()

0 commit comments

Comments
 (0)