Remove Werror and move it to CI only

cardano-scaling · Nov 6, 2023 · 8fc75af · 8fc75af
1 parent 80c1b5d
commit 8fc75af
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 108 deletions.
diff --git a/hydra-cardano-api/hydra-cardano-api.cabal b/hydra-cardano-api/hydra-cardano-api.cabal
@@ -13,11 +13,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common project-config
   default-language:   GHC2021
   default-extensions:
@@ -40,9 +35,6 @@ common project-config
     -Wincomplete-uni-patterns -Wredundant-constraints -Wunused-packages
     -fprint-potential-instances
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          project-config
   hs-source-dirs:  src

diff --git a/hydra-cluster/hydra-cluster.cabal b/hydra-cluster/hydra-cluster.cabal
@@ -55,11 +55,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common project-config
   default-language:   GHC2021
   default-extensions:
@@ -83,9 +78,6 @@ common project-config
     -Wincomplete-uni-patterns -Wredundant-constraints -Wunused-packages
     -fprint-potential-instances
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          project-config
   hs-source-dirs:  src

diff --git a/hydra-node/hydra-node.cabal b/hydra-node/hydra-node.cabal
@@ -17,11 +17,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common project-config
   default-language:   GHC2021
   default-extensions:
@@ -46,9 +41,6 @@ common project-config
     -Wincomplete-uni-patterns -Wredundant-constraints -Wunused-packages
     -fprint-potential-instances
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          project-config
   hs-source-dirs:  src
@@ -229,9 +221,7 @@ benchmark tx-cost
 
   ghc-options:    -threaded -rtsopts
 
-  if flag(hydra-development)
-    -- NOTE(SN): should fix HLS choking on PlutusTx plugin
-    ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
+  ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
 
 benchmark micro
   import:         project-config

diff --git a/hydra-plutus-extras/hydra-plutus-extras.cabal b/hydra-plutus-extras/hydra-plutus-extras.cabal
@@ -15,11 +15,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common project-config
   default-language:   GHC2021
   default-extensions:
@@ -43,9 +38,6 @@ common project-config
     -Wincomplete-uni-patterns -Wredundant-constraints -Wunused-packages
     -fprint-potential-instances
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          project-config
   exposed-modules:

diff --git a/hydra-plutus/hydra-plutus.cabal b/hydra-plutus/hydra-plutus.cabal
@@ -13,11 +13,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common project-config
   default-language:   GHC2021
   default-extensions:
@@ -43,9 +38,6 @@ common project-config
     -fno-ignore-interface-pragmas -fno-omit-interface-pragmas
     -fno-strictness
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          project-config
   exposed-modules:
@@ -86,9 +78,7 @@ library
     , template-haskell
     , time
 
-  if flag(hydra-development)
-    -- NOTE(SN): should fix HLS choking on PlutusTx plugin
-    ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
+  ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
 
 test-suite tests
   import:             project-config

diff --git a/hydra-prelude/hydra-prelude.cabal b/hydra-prelude/hydra-prelude.cabal
@@ -40,4 +40,4 @@ library
     DerivingStrategies
     LambdaCase
 
-  ghc-options:        -Wall -Werror -Wcompat -Wunused-packages
+  ghc-options:        -Wall -Wcompat -Wunused-packages
diff --git a/hydra-test-utils/hydra-test-utils.cabal b/hydra-test-utils/hydra-test-utils.cabal
@@ -13,11 +13,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common package-config
   default-language:   GHC2021
   default-extensions:
@@ -32,9 +27,6 @@ common package-config
     -Wall -Wcompat -Widentities -Wincomplete-record-updates
     -Wincomplete-uni-patterns -Wredundant-constraints -Wunused-packages
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          package-config
   hs-source-dirs:  src

diff --git a/hydra-tui/hydra-tui.cabal b/hydra-tui/hydra-tui.cabal
@@ -14,11 +14,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common project-config
   default-language:   GHC2021
   default-extensions:
@@ -41,9 +36,6 @@ common project-config
     -Wincomplete-uni-patterns -Wredundant-constraints -Wunused-packages
     -fprint-potential-instances
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          project-config
   hs-source-dirs:  src

diff --git a/nix/hydra/project.nix b/nix/hydra/project.nix
@@ -53,33 +53,49 @@ let
 
     inputMap = { "https://input-output-hk.github.io/cardano-haskell-packages" = CHaP; };
 
-    modules = [
-      # Strip debugging symbols from exes (smaller closures)
-      {
-        packages.hydra-node.dontStrip = false;
-        packages.hydra-tui.dontStrip = false;
-        packages.hydraw.dontStrip = false;
-      }
-      # Avoid plutus-tx errors in haddock (see also cabal.project)
-      {
-        packages.hydra-plutus.setupHaddockFlags = [ "--ghc-options='-fplugin-opt PlutusTx.Plugin:defer-errors'" ];
-        packages.plutus-merkle-tree.setupHaddockFlags = [ "--ghc-options='-fplugin-opt PlutusTx.Plugin:defer-errors'" ];
-        packages.plutus-cbor.setupHaddockFlags = [ "--ghc-options='-fplugin-opt PlutusTx.Plugin:defer-errors'" ];
-      }
-      # Fix compliation of strict-containers (see also cabal.project)
-      {
-        packages.strict-containers.ghcOptions = [ "-Wno-noncanonical-monad-instances" ];
+    modules = [{
+      packages = {
+
+        # Strip debugging symbols from exes (smaller closures)
+        hydra-node.dontStrip = false;
+        hydra-tui.dontStrip = false;
+        hydraw.dontStrip = false;
+
+        # Avoid plutus-tx errors in haddock (see also cabal.project)
+        hydra-plutus.setupHaddockFlags = [ "--ghc-options='-fplugin-opt PlutusTx.Plugin:defer-errors'" ];
+
+        plutus-merkle-tree.setupHaddockFlags = [ "--ghc-options='-fplugin-opt PlutusTx.Plugin:defer-errors'" ];
+        plutus-cbor.setupHaddockFlags = [ "--ghc-options='-fplugin-opt PlutusTx.Plugin:defer-errors'" ];
+
+        # Fix compliation of strict-containers (see also cabal.project)
+        strict-containers.ghcOptions = [ "-Wno-noncanonical-monad-instances" ];
+
         # XXX: Could not figure out where to make this flag ^^^ effective in the haddock build
-        packages.strict-containers.doHaddock = false;
-      }
+        strict-containers.doHaddock = false;
+
+        # -Werror for CI
+
+        hydra-cardano-api.ghcOptions = [ "-Werror" ];
+        hydra-cluster.ghcOptions = [ "-Werror" ];
+        hydra-node.ghcOptions = [ "-Werror" ];
+        hydra-plutus.ghcOptions = [ "-Werror" ];
+        hydra-plutus-extras.ghcOptions = [ "-Werror" ];
+        hydra-prelude.ghcOptions = [ "-Werror" ];
+        hydra-test-utils.ghcOptions = [ "-Werror" ];
+        hydra-tui.ghcOptions = [ "-Werror" ];
+        hydraw.ghcOptions = [ "-Werror" ];
+        plutus-cbor.ghcOptions = [ "-Werror" ];
+        plutus-merkle-tree.ghcOptions = [ "-Werror" ];
+
+      };
+    }
       ({ lib, config, ... }:
         lib.mkIf (lib.versionAtLeast config.compiler.version "9.4") {
           # lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries
           # to call out to all kinds of silly tools that GHC doesn't really provide.
           # For this reason, we try to get away without re-installing lib:ghc for now.
           reinstallableLibGhc = false;
-        })
-    ];
+        })];
   };
 in
 {

diff --git a/plutus-cbor/plutus-cbor.cabal b/plutus-cbor/plutus-cbor.cabal
@@ -13,11 +13,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common project-config
   default-language:   GHC2021
   default-extensions:
@@ -41,9 +36,6 @@ common project-config
     -fno-ignore-interface-pragmas -fno-omit-interface-pragmas
     -fno-strictness -fprint-potential-instances
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          project-config
   hs-source-dirs:  src
@@ -113,8 +105,6 @@ executable encoding-cost
     , QuickCheck
     , scientific
 
-  if flag(hydra-development)
-    -- NOTE(SN): should fix HLS choking on PlutusTx plugin
-    ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
+  ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
 
   ghc-options:    -threaded -rtsopts
diff --git a/plutus-merkle-tree/plutus-merkle-tree.cabal b/plutus-merkle-tree/plutus-merkle-tree.cabal
@@ -13,11 +13,6 @@ source-repository head
   type:     git
   location: https://github.com/input-output-hk/hydra
 
-flag hydra-development
-  description: Disable -Werror for development
-  default:     False
-  manual:      True
-
 common project-config
   default-language:   GHC2021
   default-extensions:
@@ -41,9 +36,6 @@ common project-config
     -Wnoncanonical-monad-instances -fno-ignore-interface-pragmas
     -fno-omit-interface-pragmas -fno-strictness
 
-  if !flag(hydra-development)
-    ghc-options: -Werror
-
 library
   import:          project-config
   ghc-options:     -haddock
@@ -56,9 +48,7 @@ library
     , plutus-tx
     , text
 
-  if flag(hydra-development)
-    -- NOTE(SN): should fix HLS choking on PlutusTx plugin
-    ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
+  ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
 
 test-suite tests
   import:             project-config
@@ -103,6 +93,4 @@ benchmark on-chain-cost
     , plutus-tx-plugin
     , QuickCheck
 
-  if flag(hydra-development)
-    -- NOTE(SN): should fix HLS choking on PlutusTx plugin
-    ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
+  ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors