diff --git a/.github/workflows/app-upgrade-mysql.yml b/.github/workflows/app-upgrade-mysql.yml index f4086f585..cfdee7441 100644 --- a/.github/workflows/app-upgrade-mysql.yml +++ b/.github/workflows/app-upgrade-mysql.yml @@ -14,6 +14,8 @@ on: #- 'composer.json' #- 'composer.lock' + merge_group: + push: branches: - main diff --git a/.github/workflows/app-upgrade-postgres.yml b/.github/workflows/app-upgrade-postgres.yml index 2515bdf9d..06b49141b 100644 --- a/.github/workflows/app-upgrade-postgres.yml +++ b/.github/workflows/app-upgrade-postgres.yml @@ -14,6 +14,8 @@ on: #- 'composer.json' #- 'composer.lock' + merge_group: + push: branches: - main diff --git a/.github/workflows/behat-sqlite-encryption.yml b/.github/workflows/behat-sqlite-encryption.yml index c9270d854..80d9a2a87 100644 --- a/.github/workflows/behat-sqlite-encryption.yml +++ b/.github/workflows/behat-sqlite-encryption.yml @@ -14,6 +14,7 @@ on: #- 'composer.json' #- 'composer.lock' + merge_group: push: branches: - main diff --git a/.github/workflows/behat-sqlite.yml b/.github/workflows/behat-sqlite.yml index 00924bf36..b9e896a89 100644 --- a/.github/workflows/behat-sqlite.yml +++ b/.github/workflows/behat-sqlite.yml @@ -14,6 +14,7 @@ on: #- 'composer.json' #- 'composer.lock' + merge_group: push: branches: - main diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index b63af1645..a38f00abf 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -19,6 +19,8 @@ on: - 'package.json' - 'package-lock.json' + merge_group: + push: branches: - main diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml index b7befc568..e8986a505 100644 --- a/.github/workflows/lint-eslint.yml +++ b/.github/workflows/lint-eslint.yml @@ -23,6 +23,8 @@ on: - '**.ts' - '**.vue' + merge_group: + permissions: contents: read diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml index 2bb762c3b..2700464c0 100644 --- a/.github/workflows/lint-info-xml.yml +++ b/.github/workflows/lint-info-xml.yml @@ -7,6 +7,7 @@ name: Lint info.xml on: pull_request: + merge_group: push: branches: - main diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index 47965739a..c5f2ec6fa 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -5,7 +5,9 @@ name: Lint php-cs -on: pull_request +on: + pull_request: + merge_group: permissions: contents: read diff --git a/.github/workflows/lint-stylelint.yml b/.github/workflows/lint-stylelint.yml index 1f6e05b55..843a6f532 100644 --- a/.github/workflows/lint-stylelint.yml +++ b/.github/workflows/lint-stylelint.yml @@ -5,7 +5,9 @@ name: Lint stylelint -on: pull_request +on: + pull_request: + merge_group: permissions: contents: read diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index a51a79dd0..602ffd8cc 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -17,6 +17,7 @@ on: - '**.js' - '**.ts' - '**.vue' + merge_group: push: branches: - main diff --git a/.github/workflows/occ-cli-mysql.yml b/.github/workflows/occ-cli-mysql.yml index 60788803f..8086cd28a 100644 --- a/.github/workflows/occ-cli-mysql.yml +++ b/.github/workflows/occ-cli-mysql.yml @@ -14,6 +14,7 @@ on: #- 'composer.json' #- 'composer.lock' + merge_group: push: branches: - main diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 248e2383d..94e5d20d4 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -19,6 +19,7 @@ on: - 'composer.json' - 'composer.lock' + merge_group: push: branches: - main diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index c9bb60dc2..1a8f7d318 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -7,6 +7,7 @@ name: Static analysis on: pull_request: + merge_group: push: branches: - master