Skip to content

Commit

Permalink
fix: configure merge queue
Browse files Browse the repository at this point in the history
  • Loading branch information
spaenleh committed Feb 16, 2024
1 parent dfaba0a commit 8d3437d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: CI checks

on: [push]
on:
push:
merge_group:
pull_request:

jobs:
build-and-test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Cypress CI

# Control when the action will run
on:
# Triggers the workflow on push events except for the main branch
push:
merge_group:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
Expand Down

0 comments on commit 8d3437d

Please sign in to comment.