Merge pull request #6 from input-output-hk/coot/clean

coot/clean
IntersectMBO · Jun 16, 2021 · 5b3d08c · 5b3d08c
2 parents 82f4afb + c7e6176
commit 5b3d08c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 43 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*   @coot @karknu @bolt12 @input-output-hk/network-superowners
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
       run: cabal update
 
     - name: Cabal Configure
-      run: cabal configure --enable-tests
+      run: mv cabal.project.ci cabal.project.local
 
     - name: Build dependencies
       run: cabal build --only-dependencies all

diff --git a/.github/workflows/github-page.yml b/.github/workflows/github-page.yml
@@ -54,8 +54,8 @@ jobs:
     - name: Checkout ouroboros-network repository
       uses: actions/checkout@v2
 
-    - name: Build dependencies
-      run: cabal configure --enable-tests
+    - name: Configure
+      run: cabal configure --enable-documentation --enable-tests
 
     - name: build Haddock documentation 🔧
       run: |

diff --git a/Win32-network.cabal b/Win32-network.cabal
@@ -20,26 +20,8 @@ flag demo
   description:  Build the named pipe demos
   default:      False
 
-common base                       { build-depends: base                       >= 4.5        && < 5      }
-
-common async                      { if os(windows) { build-depends: async                                                } }
-common binary                     { if os(windows) { build-depends: binary                                               } }
-common bytestring                 { if os(windows) { build-depends: bytestring                 >= 0.10       && < 0.11   } }
-common network                    { if os(windows) { build-depends: network                    >= 3.1.2      && < 3.2    } }
-common QuickCheck                 { if os(windows) { build-depends: QuickCheck                 >= 2.13.1                 } }
-common quickcheck-instances       { if os(windows) { build-depends: quickcheck-instances                                 } }
-common stm                        { if os(windows) { build-depends: stm                                                  } }
-common tasty                      { if os(windows) { build-depends: tasty                                                } }
-common tasty-hunit                { if os(windows) { build-depends: tasty-hunit                                          } }
-common tasty-quickcheck           { if os(windows) { build-depends: tasty-quickcheck                                     } }
-common Win32                      { if os(windows) { build-depends: Win32                      >= 2.5.4.1                } }
-
-common Win32-network
-  build-depends:        Win32-network
-
 common project-config
   default-language:     Haskell2010
-
   ghc-options:          -Wall
                         -Wcompat
                         -Wincomplete-uni-patterns
@@ -48,17 +30,11 @@ common project-config
                         -Widentities
                         -Wredundant-constraints
 
-  ghc-options:          -Werror
-
 library
-  import:               base, project-config
-                      , bytestring
-                      , network
-                      , Win32
-
+  import:               project-config
   hs-source-dirs:       src
-
   exposed-modules:      System.IOManager
+  build-depends:        base >=4.5 && <5
 
   if os(windows)
     exposed-modules:    System.Win32.NamedPipes
@@ -74,24 +50,33 @@ library
                         System.Win32.Async.Overlapped
                         System.Win32.Async.Socket.Syscalls
                         System.Win32.Async.WSABuf
+    build-depends:    , bytestring >=0.10    && <0.11
+                      , network
+                      , Win32      >=2.5.4.1
     include-dirs:       include
     extra-libraries:    ws2_32
 
 executable named-pipe-demo
-  import:               base, project-config
-                      , binary
-                      , bytestring
-                      , Win32
-                      , Win32-network
-
+  import:               project-config
   hs-source-dirs:       demo
   main-is:              named-pipe-demo.hs
   ghc-options:          -threaded
+  build-depends:        base
+  if os(windows)
+    build-depends:      binary
+                      , bytestring
+                      , Win32
+                      , Win32-network
 
 test-suite test
-  import:               base, project-config
-                      , async
-                      , base
+  import:               project-config
+  type:                 exitcode-stdio-1.0
+  hs-source-dirs:       test
+  main-is:              Main.hs
+  build-depends:        base
+
+  if os(windows)
+    build-depends:    , async
                       , binary
                       , bytestring
                       , network
@@ -104,11 +89,6 @@ test-suite test
                       , Win32
                       , Win32-network
 
-  type:                 exitcode-stdio-1.0
-  hs-source-dirs:       test
-  main-is:              Main.hs
-
-  if os(windows)
     other-modules:      Test.Generators
                         Test.Async.PingPong
                         Test.Async.Handle

diff --git a/cabal.project b/cabal.project
@@ -0,0 +1 @@
+packages: .
diff --git a/cabal.project.ci b/cabal.project.ci
@@ -0,0 +1,5 @@
+test: true
+documentation: false
+
+package Win32-network
+  ghc-options: -Werror