diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fea07d254..96ca7c381 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -2,7 +2,7 @@ # run functional tests, with all supported GHC versions. # # Runs: periodically, on notable pull request to master, and on -# notable push to ci-linux. +# notable push to master or ci-linux. name: linux / pull request CI @@ -25,7 +25,7 @@ on: - '!**.info' - '!**.txt' push: - branches: [ ci-linux ] + branches: [ master, ci-linux ] paths: - '.github/workflows/linux.yml' - 'stack*' diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 55ec294d6..bed9377bb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -2,12 +2,13 @@ # using less compute power and emitting less carbon. # # Runs: on notable (eg, not just doc files) push to master. +# Currently disabled in favour of linux.yml. name: push CI on: push: - branches: [ master ] + branches: [ ] paths: - '.github/workflows/push.yml' - 'stack*.yaml'