git.iko.soy/streamly
on master help sign in
Move hlint to github CI workflows and update packcheck
commitb41c0d90d7515ee17ed4a2f1b987ca3924c76187 authorAdithya Kumar <adithya@composewell.com> dateFri 8 Dec 2023, 22:27 (3 years ago) parentf400dd6
2 files changed+14−11
compare with master
unifiedsplit
.circleci/config.yml+5−10 .github/workflows/haskell.yml+9−1
.circleci/config.yml+5−10
@@ -374,7 +374,7 @@ jobs:
374374 hpc-coveralls --repo-token="$REPO_TOKEN" --coverage-mode=StrictlyFullLines
375375 no_output_timeout: 25m
376376 - *save
377− hlint-src:
377+ trailing-spaces:
378378 <<: *env
379379 executor: amd64-executor
380380 steps:
@@ -383,14 +383,9 @@ jobs:
383383 - *project-preinstall
384384 - *restore
385385 - run:
386− name: Hlint src
387− environment:
388− BUILD: hlint
389− HLINT_OPTIONS: lint
390− DISABLE_SDIST_BUILD: "yes"
391− HLINT_TARGETS: core/src src test benchmark
386+ name: Check trailing spaces
392387 command: |
393− bash -c "$PACKCHECK $BUILD" || exit 1
388+ # bash -c "$PACKCHECK $BUILD" || exit 1
394389 echo "Checking trailing spaces..."
395390 count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l)
396391 exit $count
@@ -418,5 +413,5 @@ workflows:
418413 #- coveralls-ghc-8.8.3
419414 #- coveralls-ghc-8_10_2:
420415 # name: GHC 8.10.2 + inspection + coverage + Werror
421− - hlint-src:
422− name: Hlint src + Trailing Spaces
416+ - trailing-spaces:
417+ name: Trailing Spaces
.github/workflows/haskell.yml+9−1
@@ -41,13 +41,17 @@ jobs:
4141 # packcheck location and revision
4242 PACKCHECK_LOCAL_PATH: "./packcheck.sh"
4343 PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
44− PACKCHECK_GITHUB_COMMIT: "a302772c8f3791c477edd1764b82f8d1f5b22fdf"
44+ PACKCHECK_GITHUB_COMMIT: "a68b7b9c7c21eef8ed273e67030efb1d4fec027c"
4545
4646 # Pull token from "secrets" setting of the github repo
4747 COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
4848 COVERAGE: ${{ matrix.coverage }}
4949 DOCTEST: ${{ matrix.doctest }}
5050
51+ # hlint
52+ HLINT_OPTIONS: "lint"
53+ HLINT_TARGETS: "core/src src test benchmark"
54+
5155 # Subdir
5256 SUBDIR: ${{ matrix.subdir }}
5357
@@ -170,6 +174,10 @@ jobs:
170174 cabal_build_options: "--flag debug --flag -opt"
171175 disable_sdist_build: "y"
172176 ignore_error: false
177+ - name: hlint
178+ build: hlint
179+ runner: ubuntu-latest
180+ ignore_error: true
173181
174182 steps:
175183 - uses: actions/checkout@v2