[Git][haskell-team/tools][master] 2 commits: Move more arches to portsArches

[Joachim Breitner]

Joachim Breitner pushed to branch master at Debian Haskell Group / tools


Commits:
833b3a21 by Joachim Breitner at 2019-06-07T07:42:29Z
Move more arches to portsArches

- - - - -
7a305fac by Joachim Breitner at 2019-06-07T07:42:39Z
No need for CPP to disable SQL support

- - - - -


2 changed files:

- binnmus/binNMUs.hs
- deploy-binNMU-to-wuiet.sh


Changes:

=====================================
binnmus/binNMUs.hs
=====================================
@@ -3,7 +3,7 @@
 -- This software can be copied under the terms of the Expat license
 -- (https://spdx.org/licenses/MIT)
 
-{-# LANGUAGE CPP, DeriveGeneric #-}
+{-# LANGUAGE DeriveGeneric #-}
 
 import Text.Printf
 import Data.List
@@ -37,22 +37,20 @@ import Control.DeepSeq
 import Data.Foldable (for_)
 
 
-#ifdef SQL
 import Database.PostgreSQL.Simple hiding (Binary)
 import Database.PostgreSQL.Simple.Types (Query(Query))
-#endif
 
 import AcquireFile
 
 defaultArches :: [Arch]
-defaultArches = words "amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x kfreebsd-amd64 kfreebsd-i386"
+defaultArches = words "amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x"
 
 -- non-default arches
 extraArches :: [Arch]
 extraArches = words "sparc"
 
 portsArches :: [Arch]
-portsArches = words "alpha hppa ia64 m68k powerpc powerpcspe ppc64 riscv64 sh4 sparc64 x32"
+portsArches = words "alpha hppa ia64 m68k powerpc powerpcspe ppc64 riscv64 sh4 sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386"
 
 allArches :: [Arch]
 allArches = defaultArches ++ extraArches ++ portsArches
@@ -327,7 +325,6 @@ fetchWannaBuild c | sql c     = fetchWannaBuildSQL c
 
 fetchWannaBuildSQL :: Conf -> Arch -> IO WBMap
 fetchWannaBuildSQL conf arch = do
-#ifdef SQL
     unless q $ hPutStr stderr $ printf "Querying wanna-build database for arch %s ..." arch
     unless q $ hFlush stderr
     conn <- connectPostgreSQL (B.pack "service=wanna-build")
@@ -355,9 +352,6 @@ fetchWB = Query $ B.pack $ "\
     \    architecture = ?  \
     \    AND distribution = ? \
     \"
-#else
-    error "SQL disabled"
-#endif
 
 
 fetchWannaBuildHTTP :: Conf -> Arch -> IO WBMap
@@ -489,7 +483,6 @@ type Row = (String, String, String, String, String, B.ByteString, B.ByteString)
 
 fetchArchiveSQL :: Conf -> Arch -> IO [Binary]
 fetchArchiveSQL conf arch = do
-#ifdef SQL
     unless q $ hPutStr stderr $ printf "Querying projectb database for arch %s ..." arch
     unless q $ hFlush stderr
     conn <- connectPostgreSQL (B.pack "service=projectb")
@@ -531,9 +524,6 @@ fetchBins = Query $ B.pack $ "\
     \    package, binaries.version DESC \
     \"
 
-#else
-    error "no SQL"
-#endif
 
 
 


=====================================
deploy-binNMU-to-wuiet.sh
=====================================
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
-schroot -c jessie-haskell -- ghc -DSQL -pgmP cpphs -optP --cpp -no-user-package-db -package-db=jessie-sandbox/.cabal-sandbox/x86_64-linux-ghc-7.10.3-packages.conf.d/ --make -O binNMUs
+schroot -c jessie-haskell -- ghc -no-user-package-db -package-db=jessie-sandbox/.cabal-sandbox/x86_64-linux-ghc-7.10.3-packages.conf.d/ --make -O binnmus/binNMUs.hs -o binNMUs
 rsync -i binNMUs wuiet:
 rsync -i binNMUs paradis:



View it on GitLab: https://salsa.debian.org/haskell-team/tools/compare/3316972e1a2e3918a31804407c1d260e3a17fa5c...7a305faca6b583a4bc71f37d720136268122ea66

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/tools/compare/3316972e1a2e3918a31804407c1d260e3a17fa5c...7a305faca6b583a4bc71f37d720136268122ea66
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20190607/35fff855/attachment-0001.html>