Skip to content

Commit

Permalink
add merge_group trigger for the merge queue builds (#540)
Browse files Browse the repository at this point in the history
  • Loading branch information
visr authored Aug 24, 2023
1 parent 1cdfa8f commit 41c1b9a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/core_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- "build/**"
- "core/**"
- "python/**"
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
branches: [main]
paths-ignore: [".teamcity/**"]
pull_request:
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down Expand Up @@ -72,7 +73,7 @@ jobs:
run: "quarto render docs --to html --execute"

- name: Publish Quarto Project
if: github.event_name != 'pull_request'
if: github.ref == 'refs/heads/main'
uses: quarto-dev/quarto-actions/publish@v2
with:
path: docs
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pre-commit_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Pre-commit

on:
pull_request:
merge_group:
push:
branches: [main, update/pre-commit-hooks]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/python_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
paths: [".github/**", "python/**"]
pull_request:
paths: [".github/**", "python/**"]
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/python_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
paths: [".github/**", "python/ribasim/**"]
pull_request:
paths: [".github/**", "python/ribasim/**"]
merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/qgis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- ".github/qgis.yml"
- "python/ribasim/ribasim/models.py"
- "qgis/**"
merge_group:
jobs:
test-qgis:
name: "Test"
Expand Down

0 comments on commit 41c1b9a

Please sign in to comment.