Merge pull request #106 from phadej/osx

Generate osx jobs

Author: phadej

.travis.yml

@@ -43,7 +43,7 @@ before_install:
   - HC=${CC}
   - HCPKG=${HC/ghc/ghc-pkg}
   - unset CC
-  - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
+  - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"
 
 install:
   - cabal --version

fixtures/cabal.project.empty-line.travis.yml

@@ -70,7 +70,7 @@ before_install:
   - HC=${CC}
   - HCPKG=${HC/ghc/ghc-pkg}
   - unset CC
-  - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
+  - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"
 
 install:
   - cabal --version

fixtures/cabal.project.messy.travis.yml

@@ -70,7 +70,7 @@ before_install:
   - HC=${CC}
   - HCPKG=${HC/ghc/ghc-pkg}
   - unset CC
-  - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
+  - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"
 
 install:
   - cabal --version

make_travis_yml_2.hs

@@ -23,6 +23,7 @@ import Control.DeepSeq (force)
 import Control.Exception (evaluate)
 import Control.Monad
 import Data.Char (isAsciiLower, isAsciiUpper, isSpace)
+import Data.Either (partitionEithers)
 import qualified Data.Foldable as F
 import Data.Function
 import Data.List
@@ -191,6 +192,7 @@ data Options = Options
     , optOnlyBranches :: [String]
     , optOutput :: Maybe FilePath
     , optRegenerate :: Maybe FilePath
+    , optOsx :: [String]
     } deriving Show
 
 defOptions :: Options
@@ -203,6 +205,7 @@ defOptions = Options
     , optOnlyBranches = []
     , optOutput = Nothing
     , optRegenerate = Nothing
+    , optOsx = []
     }
 
 possibleFolds :: [String]
@@ -251,6 +254,9 @@ options =
     , Option ['r'] ["regerate"]
       (ReqArg (\arg opts -> opts { optRegenerate = Just arg }) "INPUTOUTPUT")
       "regenerate the file using the magic command in output file"
+    , Option [] ["osx"]
+      (ReqArg (\arg opts -> opts { optOsx = arg : optOsx opts }) "GHC")
+      "generate osx build job with ghc version"
     ]
 
 main :: IO ()
@@ -497,6 +503,11 @@ genTravisFromConfigs (argv,opts) xpkgs isCabalProject (versions,cfg,pkgs) = do
     putStrLnInfo $
         "Generating Travis-CI config for testing for GHC versions: " ++ ghcVersions
 
+    unless (null $ optOsx opts) $  do
+        putStrLnInfo $ "Also OSX jobs for: " ++ ghcOsxVersions
+        unless (S.null omittedOsxVersions) $
+            putStrLnWarn $ "Not all GHC versions specified with --osx are generated: " ++ ghcOmittedOsxVersions
+
     ---------------------------------------------------------------------------
     -- travis.yml generation starts here
 
@@ -543,7 +554,16 @@ genTravisFromConfigs (argv,opts) xpkgs isCabalProject (versions,cfg,pkgs) = do
         , "  directories:"
         , "    - $HOME/.cabal/packages"
         , "    - $HOME/.cabal/store"
-        , ""
+        ]
+
+    -- on OSX ghc is installed in $HOME so we can cache it
+    -- independently of linux
+    unless (optNoCache opts || null (optOsx opts)) $ tellStrLns
+        [ "    - $HOME/.ghc-install"
+        ]
+
+    unless (optNoCache opts) $ tellStrLns
+        [ ""
         , "before_cache:"
         , "  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log"
         , "  # remove files that are regenerated by 'cabal update'"
@@ -560,23 +580,29 @@ genTravisFromConfigs (argv,opts) xpkgs isCabalProject (versions,cfg,pkgs) = do
 
     let colls = [ (collToGhcVer cid,cid) | cid <- reverse $ optCollections opts ]
 
-    F.forM_ versions $ \gv -> do
-        let cvs = dispGhcVersion (lookupCabVer gv)
-            gvs = dispGhcVersion gv
+    let tellJob osx gv = do
+            let cvs = dispGhcVersion (lookupCabVer gv)
+                gvs = dispGhcVersion gv
 
-            xpkgs' = concatMap (',':) xpkgs
+                xpkgs' = concatMap (',':) xpkgs
 
-            colls' = [ cid | (v,cid) <- colls, v == gv ]
+                colls' = [ cid | (v,cid) <- colls, v == gv ]
 
-        tellStrLns
-            [ concat [ "    - compiler: \"ghc-", gvs, "\"" ]
-            , if null colls' then
-                       "    # env: TEST=--disable-tests BENCH=--disable-benchmarks"
-              else
-                      ("      env: 'COLLECTIONS=" ++ intercalate "," colls' ++ "'")
-            , concat [ "      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-", cvs, ",ghc-", gvs, xpkgs', "], sources: [hvr-ghc]}}" ]
-            ]
-        return ()
+            tellStrLns
+                [ concat [ "    - compiler: \"ghc-", gvs, "\"" ]
+                , if null colls' then
+                           "    # env: TEST=--disable-tests BENCH=--disable-benchmarks"
+                  else
+                          ("      env: 'COLLECTIONS=" ++ intercalate "," colls' ++ "'")
+                , concat [ "      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-", cvs, ",ghc-", gvs, xpkgs', "], sources: [hvr-ghc]}}" ]
+                ]
+
+            when osx $ tellStrLns
+                [ "      os: osx"
+                ]
+
+    F.forM_ versions $ tellJob False
+    F.forM_ osxVersions $ tellJob True
 
     let headGhcVers = S.filter isGhcHead versions
 
@@ -592,9 +618,19 @@ genTravisFromConfigs (argv,opts) xpkgs isCabalProject (versions,cfg,pkgs) = do
         [ ""
         , "before_install:"
         , sh "HC=${CC}"
-        , "  - HCPKG=${HC/ghc/ghc-pkg}"
-        , "  - unset CC"
-        , "  - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"
+        , sh' [2034,2039] "HCPKG=${HC/ghc/ghc-pkg}" -- SC2039. In POSIX sh, string replacement is undefined.
+        , sh "unset CC"
+        ]
+
+    let haskellOnMacos = "https://haskell.futurice.com/haskell-on-macos.py"
+
+    if null (optOsx opts)
+    then tellStrLns
+        [ sh "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"
+        ]
+    else tellStrLns
+        [ sh $ "if [ \"$(uname)\" = \"Darwin\" ]; then brew update; brew install python3; curl " ++ haskellOnMacos ++ " | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=head install cabal-install-head ${HC}; fi"
+        , sh $ "if [ \"$(uname)\" = \"Darwin\" ]; then PATH=$HOME/.ghc-install/ghc/bin:$PATH; else PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH; fi"
         ]
 
     unless (null colls) $
@@ -749,8 +785,24 @@ genTravisFromConfigs (argv,opts) xpkgs isCabalProject (versions,cfg,pkgs) = do
       where
         quote pkg = pkg{ pkgDir = "\"" ++ pkgDir pkg ++ "\"" }
 
+    showVersions :: Set Version -> String
+    showVersions = unwords . map dispGhcVersion . S.toList
+
+    -- specified ersions
+    osxVersions' :: Set Version
+    osxVersions' = S.fromList $ mapMaybe simpleParse $ optOsx opts
+
     ghcVersions :: String
-    ghcVersions = unwords $ map dispGhcVersion $ S.toList $ versions
+    ghcVersions = showVersions versions
+
+    osxVersions, omittedOsxVersions :: Set Version
+    (osxVersions, omittedOsxVersions) = S.partition (`S.member` versions) osxVersions'
+
+    ghcOsxVersions :: String
+    ghcOsxVersions = showVersions osxVersions
+
+    ghcOmittedOsxVersions :: String
+    ghcOmittedOsxVersions = showVersions omittedOsxVersions
 
     lookupCabVer :: Version -> Version
     lookupCabVer v = maybe (error "internal error") id $ lookup (x,y) cabalVerMap