git.iko.soy/stackage
on master help sign in
Generate v2 bundle during complete build
7dfde3bMichael Snoyman
Stackage/CompleteBuild.hs+18−1
compare with master
unifiedsplit
@@ -57,6 +57,8 @@ data Settings = Settings
57 , setArgs :: Text -> UploadBundle -> UploadBundle
57 , setArgs :: Text -> UploadBundle -> UploadBundle
58 , postBuild :: IO ()
58 , postBuild :: IO ()
59 , distroName :: Text -- ^ distro name on Hackage
59 , distroName :: Text -- ^ distro name on Hackage
60+ , snapshotType :: SnapshotType
61+ , bundleDest :: FilePath
60 }
62 }
61
63
62nightlyPlanFile :: Text -- ^ day
64nightlyPlanFile :: Text -- ^ day
@@ -81,6 +83,8 @@ nightlySettings day plan' = Settings
81 , plan = plan'
83 , plan = plan'
82 , postBuild = return ()
84 , postBuild = return ()
83 , distroName = "Stackage"
85 , distroName = "Stackage"
86+ , snapshotType = STNightly
87+ , bundleDest = fpFromText $ "stackage-nightly-" ++ tshow day ++ ".bundle"
84 }
88 }
85 where
89 where
86 slug' = "nightly-" ++ day
90 slug' = "nightly-" ++ day
@@ -142,6 +146,10 @@ getSettings man (LTS bumpType) = do
142 putStrLn "Pushing to Git repository"
146 putStrLn "Pushing to Git repository"
143 git ["push"]
147 git ["push"]
144 , distroName = "LTSHaskell"
148 , distroName = "LTSHaskell"
149+ , snapshotType =
150+ case new of
151+ LTSVer x y -> STLTS x y
152+ , bundleDest = fpFromText $ "stackage-lts-" ++ tshow new ++ ".bundle"
145 }
153 }
146
154
147data LTSVer = LTSVer !Int !Int
155data LTSVer = LTSVer !Int !Int
@@ -231,7 +239,16 @@ completeBuild buildType buildFlags = withManager tlsManagerSettings $ \man -> do
231 checkBuildPlan plan
239 checkBuildPlan plan
232
240
233 putStrLn "Performing build"
241 putStrLn "Performing build"
234− performBuild (getPerformBuild buildFlags settings) >>= mapM_ putStrLn
242+ let pb = getPerformBuild buildFlags settings
243+ performBuild pb >>= mapM_ putStrLn
244+
245+ putStrLn $ "Creating bundle (v2) at: " ++ fpToText bundleDest
246+ createBundleV2 CreateBundleV2
247+ { cb2Plan = plan
248+ , cb2Type = snapshotType
249+ , cb2DocsDir = pbDocDir pb
250+ , cb2Dest = bundleDest
251+ }
235
252
236 when (bfDoUpload buildFlags) $
253 when (bfDoUpload buildFlags) $
237 finallyUpload settings man
254 finallyUpload settings man