diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/mergify.yml | 29 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/hlint-ci.yml | 26 |
3 files changed, 60 insertions, 2 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 00000000..de362dd2 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,29 @@ +pull_request_rules: + # rebase+merge strategy + - actions: + queue: + name: default + # Merge into master with a merge commit + method: merge + # Update the pr branch with rebase, so the history is clean + update_method: rebase + name: Put pull requests in the rebase+merge queue + conditions: + - label=merge me + - '#approved-reviews-by>=1' + # merge+squash strategy + - actions: + queue: + name: default + method: squash + # both update methods get absorbed by the squash, so we use the most + # reliable + update_method: merge + name: Put pull requests in the squash+merge queue + conditions: + - label=squash+merge me + - '#approved-reviews-by>=1' + +queue_rules: + - name: default + conditions: [] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dafcdc74..fc1db83e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,18 +38,21 @@ jobs: - name: Freeze run: | + cabal configure --with-compiler ghc-${{ matrix.ghc }} --enable-tests --enable-benchmarks --test-show-details=direct cabal freeze - + - uses: actions/cache@v2 name: Cache ~/.cabal/store with: path: | ${{ steps.setup-haskell-cabal.outputs.cabal-store }} + dist-newstyle key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }} + restore-keys: | + ${{ runner.os }}-cabal-${{ matrix.ghc }} - name: Build run: | - cabal configure --enable-tests --enable-benchmarks --test-show-details=direct cabal build all - name: Test diff --git a/.github/workflows/hlint-ci.yml b/.github/workflows/hlint-ci.yml new file mode 100644 index 00000000..7009e739 --- /dev/null +++ b/.github/workflows/hlint-ci.yml @@ -0,0 +1,26 @@ +name: hlint + +on: + pull_request: + push: + +jobs: + build: + name: hlint + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + submodules: true + + - uses: rwe/actions-hlint-setup@v1 + name: Set up HLint + with: + version: "3.4.1" + + - uses: rwe/actions-hlint-run@v2 + name: hlint + with: + path: '[ "haddock-library/", "haddock-api/", "haddock-test/", "hoogle-test/", "html-test/", "hypsrc-test/", "latex-test/" ]' + fail-on: suggestion
\ No newline at end of file |