From 89e613c6786b61db4e231b2c15c76d960768f9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C5=A0ebek?= <44544735+xsebek@users.noreply.github.com> Date: Sun, 7 Nov 2021 15:55:03 +0100 Subject: [PATCH] Add the CI file check to mergify (#283) I made a mistake in #279, for PRs that modify both .hs an .md the dummy would pass :roll_eyes: Copying the logic to .mergify.yml should fix this. :crossed_fingers: --- .github/workflows/dummy-ci.yml | 28 ---------------------------- .mergify.yml | 9 ++++++++- 2 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/dummy-ci.yml diff --git a/.github/workflows/dummy-ci.yml b/.github/workflows/dummy-ci.yml deleted file mode 100644 index e1b4c342..00000000 --- a/.github/workflows/dummy-ci.yml +++ /dev/null @@ -1,28 +0,0 @@ -# RUN IN CASE Haskell-CI DOES NOT RUN -# used for mergify check -name: Co-Haskell-CI -on: - push: - paths-ignore: - - '**.hs' - - '**.sw' - - '**.cabal' - - '*.yaml' - - 'data/**.yaml' - - 'cabal.project*' - # reuse the same filter for pull-requests - pull_request: - paths-ignore: - - '**.hs' - - '**.sw' - - '**.cabal' - - 'stack.yaml' - - '*.yaml' - - 'data/**.yaml' - - 'cabal.project*' -jobs: - linux: - runs-on: ubuntu-latest - steps: - - name: Do nothing - run: exit 0 \ No newline at end of file diff --git a/.mergify.yml b/.mergify.yml index 84196f52..e846128d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -7,7 +7,14 @@ pull_request_rules: name: Automatically merge pull requests conditions: - or: - - check-success=Co-Haskell-CI + - and: + - -files~=\.hs$ + - -files~=\.sw$ + - -files~=\.cabal$ + - -files=stack.yaml + - -files~=cabal.project.* + - -files~=^[^/]*\.yaml$ + - -files~=^data/.*\.yaml$ - and: - check-success=Haskell-CI - Linux - ghc-9.0.1 - check-success=Haskell-CI - Linux - ghc-8.10.4