b41c0d9 · streamly · git.iko.soy

git.iko.soy/streamly

on master help sign in

Move hlint to github CI workflows and update packcheck

b41c0d9Adithya Kumar3 years ago

.circleci/config.yml+5−10

compare with master

unifiedsplit

@@ -374,7 +374,7 @@ jobs:

374 hpc-coveralls --repo-token="$REPO_TOKEN" --coverage-mode=StrictlyFullLines

375 no_output_timeout: 25m

376 - *save

377− hlint-src:

377+ trailing-spaces:

378 <<: *env

379 executor: amd64-executor

380 steps:

@@ -383,14 +383,9 @@ jobs:

383 - *project-preinstall

384 - *restore

385 - run:

386− name: Hlint src

386+ name: Check trailing spaces

387− environment:

388− BUILD: hlint

389− HLINT_OPTIONS: lint

390− DISABLE_SDIST_BUILD: "yes"

391− HLINT_TARGETS: core/src src test benchmark

392 command: |

387 command: |

393− bash -c "$PACKCHECK $BUILD" || exit 1

388+ # bash -c "$PACKCHECK $BUILD" || exit 1

394 echo "Checking trailing spaces..."

389 echo "Checking trailing spaces..."

395 count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l)

390 count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l)

396 exit $count

391 exit $count

@@ -418,5 +413,5 @@ workflows:

418 #- coveralls-ghc-8.8.3

413 #- coveralls-ghc-8.8.3

419 #- coveralls-ghc-8_10_2:

414 #- coveralls-ghc-8_10_2:

420 # name: GHC 8.10.2 + inspection + coverage + Werror

415 # name: GHC 8.10.2 + inspection + coverage + Werror

421− - hlint-src:

416+ - trailing-spaces:

422− name: Hlint src + Trailing Spaces

417+ name: Trailing Spaces

.github/workflows/haskell.yml+9−1

@@ -41,13 +41,17 @@ jobs:

41 # packcheck location and revision

42 PACKCHECK_LOCAL_PATH: "./packcheck.sh"

43 PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"

44− PACKCHECK_GITHUB_COMMIT: "a302772c8f3791c477edd1764b82f8d1f5b22fdf"

44+ PACKCHECK_GITHUB_COMMIT: "a68b7b9c7c21eef8ed273e67030efb1d4fec027c"

46 # Pull token from "secrets" setting of the github repo

47 COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

48 COVERAGE: ${{ matrix.coverage }}

49 DOCTEST: ${{ matrix.doctest }}

51+ # hlint

52+ HLINT_OPTIONS: "lint"

53+ HLINT_TARGETS: "core/src src test benchmark"

54+

51 # Subdir

55 # Subdir

52 SUBDIR: ${{ matrix.subdir }}

56 SUBDIR: ${{ matrix.subdir }}

@@ -170,6 +174,10 @@ jobs:

170 cabal_build_options: "--flag debug --flag -opt"

174 cabal_build_options: "--flag debug --flag -opt"

171 disable_sdist_build: "y"

175 disable_sdist_build: "y"

172 ignore_error: false

176 ignore_error: false

177+ - name: hlint

178+ build: hlint

179+ runner: ubuntu-latest

180+ ignore_error: true

173

181

174 steps:

182 steps:

175 - uses: actions/checkout@v2

183 - uses: actions/checkout@v2