From 744442760930f98e45535548eba3897d2b1e4342 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 25 Jan 2019 10:08:05 -0800 Subject: Revert "CircleCI - use -O0 only for cabal-v2 builds." This reverts commit 062a8fb10bf3eb7b92d3b8b942f106293ef24902. --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b185ffeb..3304ad264 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: "2.1" env: &env environment: LC_ALL: "C.UTF-8" - GHC_OPTS: "-Wall -fno-warn-unused-do-bind -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -Wincomplete-uni-patterns -Werror=missing-home-modules -Widentities -Wcpp-undef -fhide-source-paths" + GHC_OPTS: "-O0 -Wall -fno-warn-unused-do-bind -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -Wincomplete-uni-patterns -Werror=missing-home-modules -Widentities -Wcpp-undef -fhide-source-paths" docker: - image: fpco/stack-build:lts @@ -52,15 +52,15 @@ commands: cd ${TMPDIR} tar xvzf *.tar.gz cd * - cabal v2-build -j2 --dependencies-only --enable-tests --ghc-options="-O0 ${GHC_OPTS}" all - cabal v2-build -j2 --enable-tests --ghc-options="-O0 ${GHC_OPTS}" all 2>build.log + cabal v2-build -j2 --dependencies-only --enable-tests --ghc-options="${GHC_OPTS}" all + cabal v2-build -j2 --enable-tests --ghc-options="${GHC_OPTS}" all 2>build.log # fail if we had warnings in local build # this is to work around the fact that cabal v2 doesn't allow # us to use -Werror for just local build: # https://github.com/haskell/cabal/issues/4247 ! grep -q "warning:" build.log - cabal v2-test --ghc-options="-O0 ${GHC_OPTS}" 2>build.log - cabal v2-haddock --ghc-options="-O0 ${GHC_OPTS}" + cabal v2-test --ghc-options="${GHC_OPTS}" 2>build.log + cabal v2-haddock --ghc-options="${GHC_OPTS}" cabal check - *save -- cgit v1.2.3