From 44d2b84b731cf8cbae1df81abd6fe8a48355cc20 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 18:31:10 +0530 Subject: [PATCH 01/23] Add CI for 80 char length --- .circleci/config.yml | 20 +++++--- .github/workflows/haskell.yml | 87 +---------------------------------- 2 files changed, 15 insertions(+), 92 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a52ca5290f..e5df47baeb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,15 +392,23 @@ 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 > 0 ] + then exit 1 + fi + git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len + count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) + rm tmp_len + if [ $count2 > 0 ] + then exit 2 + 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 +417,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 @@ -418,4 +426,4 @@ workflows: #- coveralls-ghc-8_10_2: # name: GHC 8.10.2 + inspection + coverage + Werror - hlint-src: - name: Hlint src + Trailing Spaces + name: Hlint src + Trailing Spaces + Column Length diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index f896a63202..5714cc27cb 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -70,92 +70,7 @@ jobs: 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 - build: cabal - cabal_version: 3.6 - cabal_project: cabal.project - ignore_error: false - + steps: - uses: actions/checkout@v2 From 0bf780cffa2364a2a77711dc5d2475f7620c2d5c Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 19:21:35 +0530 Subject: [PATCH 02/23] Add CI for 80 char length --- .github/workflows/haskell.yml | 87 ++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 5714cc27cb..f896a63202 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -70,7 +70,92 @@ jobs: 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 + build: cabal + cabal_version: 3.6 + cabal_project: cabal.project + ignore_error: false + steps: - uses: actions/checkout@v2 From 706d21359ef33945d01c1dd9306424b4b235953a Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 20:11:25 +0530 Subject: [PATCH 03/23] Add CI for 80 char length --- .circleci/config.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5df47baeb..a52ca5290f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,23 +392,15 @@ jobs: bash -c "$PACKCHECK $BUILD" || exit 1 echo "Checking trailing spaces..." count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l) - if [ $count > 0 ] - then exit 1 - fi - git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len - count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) - rm tmp_len - if [ $count2 > 0 ] - then exit 2 - fi + exit $count - *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 @@ -417,8 +409,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 @@ -426,4 +418,4 @@ workflows: #- coveralls-ghc-8_10_2: # name: GHC 8.10.2 + inspection + coverage + Werror - hlint-src: - name: Hlint src + Trailing Spaces + Column Length + name: Hlint src + Trailing Spaces From 84fae39c3d08ff4557d4cd388d69f201fe516812 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 20:23:43 +0530 Subject: [PATCH 04/23] Add CI for 80 char length --- .github/workflows/haskell.yml | 86 ----------------------------------- 1 file changed, 86 deletions(-) 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 From dd20a16756d9995b49a3abe04e0234dbdc729d58 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 20:27:43 +0530 Subject: [PATCH 05/23] Add CI for 80 char length --- .circleci/config.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a52ca5290f..43f995f366 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,7 +392,15 @@ 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 > 0 ] + then exit 1 + fi + git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len + count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) + rm tmp_len + if [ $count2 > 0 ] + then exit 2 + fi - *save workflows: @@ -409,8 +417,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 @@ -418,4 +426,4 @@ workflows: #- coveralls-ghc-8_10_2: # name: GHC 8.10.2 + inspection + coverage + Werror - hlint-src: - name: Hlint src + Trailing Spaces + name: Hlint src + Trailing Spaces + Column Length From f29361b9018dac53965fca3f3b8f6679b3843d5c Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 20:31:20 +0530 Subject: [PATCH 06/23] Add CI for 80 char length --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 43f995f366..c6507b9fba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -395,12 +395,6 @@ jobs: if [ $count > 0 ] then exit 1 fi - git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len - count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) - rm tmp_len - if [ $count2 > 0 ] - then exit 2 - fi - *save workflows: From 09b8fbae46e6de3e5f241b9e83acb433dd776989 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 20:39:01 +0530 Subject: [PATCH 07/23] Add CI for 80 char length --- .circleci/config.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c6507b9fba..867cd4b681 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -395,6 +395,12 @@ jobs: if [ $count > 0 ] then exit 1 fi + git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len + count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) + rm tmp_len + if [ $count2 > 0 ] + then exit 2 + fi - *save workflows: @@ -411,8 +417,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 From 27a87acf8adc70032bf1c24c1509c534b35ea993 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 20:56:05 +0530 Subject: [PATCH 08/23] Add CI for 80 char length --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 867cd4b681..7921827a48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -395,12 +395,6 @@ jobs: if [ $count > 0 ] then exit 1 fi - git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len - count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) - rm tmp_len - if [ $count2 > 0 ] - then exit 2 - fi - *save workflows: From bd71782e7da5d712040b4e26196617b69e694159 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 20:59:28 +0530 Subject: [PATCH 09/23] Add CI for 80 char length --- .circleci/config.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7921827a48..35821dae49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,17 +392,15 @@ jobs: bash -c "$PACKCHECK $BUILD" || exit 1 echo "Checking trailing spaces..." count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l) - if [ $count > 0 ] - then exit 1 - fi + exit $count - *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 @@ -411,8 +409,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 @@ -420,4 +418,4 @@ workflows: #- coveralls-ghc-8_10_2: # name: GHC 8.10.2 + inspection + coverage + Werror - hlint-src: - name: Hlint src + Trailing Spaces + Column Length + name: Hlint src + Trailing Spaces From dc552e52898546827511c37a06da32486fdc3a1f Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 21:04:46 +0530 Subject: [PATCH 10/23] Add CI for 80 char length --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35821dae49..656c411c83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,7 +392,9 @@ 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 > 0 ] + then exit 1 + fi - *save workflows: From fb924d57f76d77c33a8df5fd64a61c5353e0d1df Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 21:08:07 +0530 Subject: [PATCH 11/23] Add CI for 80 char length --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 656c411c83..1e5467af33 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -394,6 +394,7 @@ jobs: count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l) if [ $count > 0 ] then exit 1 + else exit $count fi - *save From 34ecb2b8f5608f28d4b3ead523e55f50562bcb2a Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 21:44:07 +0530 Subject: [PATCH 12/23] Add CI for 80 char length --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e5467af33..83e9521e14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,7 +392,7 @@ jobs: bash -c "$PACKCHECK $BUILD" || exit 1 echo "Checking trailing spaces..." count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l) - if [ $count > 0 ] + if [ $count -gt 0 ] then exit 1 else exit $count fi From 16a5c2e332a535a7044d58ab6143a60608713a66 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 21:49:40 +0530 Subject: [PATCH 13/23] Add CI for 80 char length --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83e9521e14..da53f97381 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -396,6 +396,12 @@ jobs: then exit 1 else exit $count fi + git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len + count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) + rm tmp_len + if [ $count2 -gt 0 ] + then exit 2 + fi - *save workflows: From fe7fe4d65c5684c755bdfb595cff48c23ec7439d Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 21:50:44 +0530 Subject: [PATCH 14/23] Add CI for 80 char length --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index da53f97381..78c9110451 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -401,6 +401,7 @@ jobs: rm tmp_len if [ $count2 -gt 0 ] then exit 2 + else exit $count2 fi - *save From 4a33fa79dfc76c7b4ab85752c427f484784a2cb3 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 21:53:45 +0530 Subject: [PATCH 15/23] Add CI for 80 char length --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78c9110451..7d5bf1d9d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -394,7 +394,6 @@ jobs: count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l) if [ $count -gt 0 ] then exit 1 - else exit $count fi git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) From b280131f28f42c8bfe3d9cf65c68c679f817c322 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 22:00:43 +0530 Subject: [PATCH 16/23] Add CI for 80 char length --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d5bf1d9d1..86bba25e54 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -395,6 +395,8 @@ jobs: if [ $count -gt 0 ] then exit 1 fi + bash -c "$PACKCHECK $BUILD" || exit 1 + echo "Checking 80 char column..." git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) rm tmp_len From 633482977b2f01f55f1647174ee2b236ee4a3c12 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 22:14:45 +0530 Subject: [PATCH 17/23] Add CI for 80 char length --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86bba25e54..99bb5ee65f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -395,7 +395,6 @@ jobs: if [ $count -gt 0 ] then exit 1 fi - bash -c "$PACKCHECK $BUILD" || exit 1 echo "Checking 80 char column..." git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) From 0d5627271c5c1ad7a2c6e1e018fd3259b2033141 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 22:20:33 +0530 Subject: [PATCH 18/23] Add CI for 80 char length --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 99bb5ee65f..d629417bd7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -401,7 +401,7 @@ jobs: rm tmp_len if [ $count2 -gt 0 ] then exit 2 - else exit $count2 + else exit 0 fi - *save From d9ab29437bf77e686d7d36268632ee932669a6cd Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 22:24:16 +0530 Subject: [PATCH 19/23] Add CI for 80 char length --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d629417bd7..7bc487bc1e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -401,7 +401,6 @@ jobs: rm tmp_len if [ $count2 -gt 0 ] then exit 2 - else exit 0 fi - *save From c4c3abd486c92933102dbb1e8eed159e073a5d64 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 22:30:18 +0530 Subject: [PATCH 20/23] Add CI for 80 char length --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bc487bc1e..be398e6279 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -400,7 +400,8 @@ jobs: count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) rm tmp_len if [ $count2 -gt 0 ] - then exit 2 + then exit 0 + else exit 0 fi - *save From 6d3da0b379bdf221f911376a0e9167a62fb955a5 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 22:31:23 +0530 Subject: [PATCH 21/23] Add CI for 80 char length --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index be398e6279..d629417bd7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -400,7 +400,7 @@ jobs: count2=$(awk '{ if (length($0) > 80) {print "Line length exceeds 80 : " length($0); print $0; } }' tmp_len | tee /dev/tty | wc -l) rm tmp_len if [ $count2 -gt 0 ] - then exit 0 + then exit 2 else exit 0 fi - *save From fe3336e3d32b9e069fc8788731fa90260885c3a5 Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 22:51:33 +0530 Subject: [PATCH 22/23] Fix CI --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d629417bd7..ae4412f12b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -398,6 +398,7 @@ jobs: echo "Checking 80 char column..." git diff master HEAD "*.hs" | grep '^+' | grep -v '^+++' > tmp_len 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 From 0fa67c9cd1b93c6476a0cb6cc3815002e40804cb Mon Sep 17 00:00:00 2001 From: Ranjeet Kumar Ranjan Date: Thu, 24 Mar 2022 22:59:54 +0530 Subject: [PATCH 23/23] Fix CI --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae4412f12b..43b6e0f023 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -396,7 +396,9 @@ jobs: 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