Skip to content

Commit

Permalink
Merge 3ceb7ec into a6a472f
Browse files Browse the repository at this point in the history
  • Loading branch information
Waelthus committed Jun 15, 2023
2 parents a6a472f + 3ceb7ec commit 5f8e729
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump_version.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Bump version
on:
push:
merge_group:
branches:
- master
jobs:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Pylint

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

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Pytest
on:
[push, pull_request]
on:
[push, pull_request, merge_group]
env:
SETUP_XVFB: True # avoid issues if mpl tries to open a GUI window

Expand Down

0 comments on commit 5f8e729

Please sign in to comment.