diff --git a/.circleci/config.yml b/.circleci/config.yml index a52ca5290f..43b6e0f023 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,15 +392,28 @@ jobs: bash -c "$PACKCHECK $BUILD" || exit 1 echo "Checking trailing spaces..." count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l) - exit $count + if [ $count -gt 0 ] + then exit 1 + fi + echo "Checking 80 char column..." + echo "Before..." + git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len + echo "Afterrrrr..." + count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) + echo "count2=" $count2 + rm tmp_len + if [ $count2 -gt 0 ] + then exit 2 + else exit 0 + fi - *save workflows: version: 2 build: jobs: - - cabal-ghc-8_10_4: - name: GHC 8.10.4 + sdist + no-test + no-bench + #- cabal-ghc-8_10_4: + # name: GHC 8.10.4 + sdist + no-test + no-bench #- cabal-ghc-8.6.5 #- cabal-ghc-8_4_4: # name: GHC 8.4.4 + x86 + debug @@ -409,8 +422,8 @@ workflows: #- cabal-ghc-8_0_2: # name: GHC 8.0.2 + no-test + no-bench + no-docs #- cabal-ghc-7.10.3 - - cabal-ghcjs-8_4: - name: GHCJS 8.4 + no-test + no-docs + #- cabal-ghcjs-8_4: + # name: GHCJS 8.4 + no-test + no-docs #- stack-ghc-8.4 #- stack-ghc-8.2 #- coveralls-ghc-8.2.2 diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index f896a63202..f632d232eb 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -62,92 +62,6 @@ jobs: # run. But we need at least one test where we test without # cabal.project because that is how hackage would build it. include: - - name: head - ghc_version: head - runner: ubuntu-latest - build: cabal - cabal_version: latest - cabal_project: cabal.project.ghc-head - disable_sdist_build: "y" - ignore_error: true - - name: 9.2.1 - ghc_version: 9.2.1 - runner: ubuntu-latest - build: cabal - cabal_project: cabal.project - cabal_version: 3.6 - disable_sdist_build: "y" - ignore_error: false - - name: 9.2.1-docspec - ghc_version: 9.2.1 - runner: ubuntu-latest - doctest: "y" - cabal_version: 3.6 - cabal_project: cabal.project - ignore_error: false - - name: 9.0.1 - ghc_version: 9.0.1 - runner: ubuntu-latest - build: cabal - cabal_version: 3.6 - cabal_project: cabal.project - disable_sdist_build: "y" - ignore_error: false - - name: 8.10.7-sdist-stack - runner: ubuntu-latest - build: stack - resolver: lts-18.23 - stack_yaml: stack.yaml - sdist_options: "--ignore-check" - stack_build_options: "--flag streamly-benchmarks:-opt" - cabal_version: 3.6 - ignore_error: false - - name: 8.10.7-macos - ghc_version: 8.10.7 - runner: macos-latest - build: cabal - cabal_version: 3.6 - cabal_project: cabal.project - disable_sdist_build: "y" - ignore_error: false - # - name: 8.10.7-coverage - # ghc_version: 8.10.7 - # runner: ubuntu-latest - # coverage: "y" - # cabal_version: 3.6 - # ignore_error: false - - name: 8.10.7-sdist-fusion-inspection-Werror - ghc_version: 8.10.7 - runner: ubuntu-latest - build: cabal - cabal_version: 3.6 - cabal_project: cabal.project.Werror - cabal_build_options: "--flag fusion-plugin --flag inspection" - ignore_error: false - - name: 8.8.4-sdist-fusion - ghc_version: 8.8.4 - runner: ubuntu-latest - build: cabal - cabal_version: 3.6 - cabal_project: cabal.project - cabal_build_options: "--flag fusion-plugin" - ignore_error: false - - name: 8.6.5-sdist-streamk-unoptimized - ghc_version: 8.6.5 - runner: ubuntu-latest - build: cabal - cabal_version: 3.6 - cabal_project: cabal.project - cabal_build_options: "--flag streamk --flag -opt" - ignore_error: false - - name: 8.6.5-sdist-debug-unoptimized - ghc_version: 8.6.5 - runner: ubuntu-latest - build: cabal - cabal_version: 3.6 - cabal_project: cabal.project - cabal_build_options: "--flag debug --flag -opt" - ignore_error: false - name: 8.4.4-sdist ghc_version: 8.4.4 runner: ubuntu-latest