Skip to content

Commit

Permalink
Merge pull request #937 from nextcloud/enh/merge-queue-prep
Browse files Browse the repository at this point in the history
test(ci): run all relevant tests in merge queue
  • Loading branch information
max-nextcloud authored Oct 10, 2023
2 parents f19e92d + 1786d76 commit 6059560
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/app-upgrade-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ on:
#- 'composer.json'
#- 'composer.lock'

merge_group:

push:
branches:
- main
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/app-upgrade-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ on:
#- 'composer.json'
#- 'composer.lock'

merge_group:

push:
branches:
- main
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/behat-sqlite-encryption.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
#- 'composer.json'
#- 'composer.lock'

merge_group:
push:
branches:
- main
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/behat-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
#- 'composer.json'
#- 'composer.lock'

merge_group:
push:
branches:
- main
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ on:
- 'package.json'
- 'package-lock.json'

merge_group:

push:
branches:
- main
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/lint-eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ on:
- '**.ts'
- '**.vue'

merge_group:

permissions:
contents: read

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint-info-xml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ name: Lint info.xml

on:
pull_request:
merge_group:
push:
branches:
- main
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/lint-php-cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

name: Lint php-cs

on: pull_request
on:
pull_request:
merge_group:

permissions:
contents: read
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/lint-stylelint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

name: Lint stylelint

on: pull_request
on:
pull_request:
merge_group:

permissions:
contents: read
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- '**.js'
- '**.ts'
- '**.vue'
merge_group:
push:
branches:
- main
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/occ-cli-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
#- 'composer.json'
#- 'composer.lock'

merge_group:
push:
branches:
- main
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
- 'composer.json'
- 'composer.lock'

merge_group:
push:
branches:
- main
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ name: Static analysis

on:
pull_request:
merge_group:
push:
branches:
- master
Expand Down

0 comments on commit 6059560

Please sign in to comment.