git.iko.soy/stackage
on master help sign in
skip-check option to nightly (good for 7.10 builds)
commit548578c16b0833232a2a3850fabf89aae22d64b4 authorMichael Snoyman <michael@snoyman.com> dateWed 7 Jan 2015, 17:10 (12 years ago) parentfb5e40a
5 files changed+17−5
compare with master
unifiedsplit
ChangeLog.md+2−1 Stackage/CompleteBuild.hs+7−2 Stackage/PerformBuild.hs+3 app/stackage.hs+4−1 stackage.cabal+1−1
ChangeLog.md+2−1
@@ -1,7 +1,8 @@
1−## 0.4.1
1+## 0.5.0
22
33* Print "Still Alive" while checking, to avoid Travis timeouts
44* Include `stackage upload-nightly` command
5+* Optional plan checking
56
67## 0.4.0
78
Stackage/CompleteBuild.hs+7−2
@@ -35,6 +35,7 @@ data BuildFlags = BuildFlags
3535 , bfDoUpload :: !Bool
3636 , bfEnableLibProfile :: !Bool
3737 , bfVerbose :: !Bool
38+ , bfSkipCheck :: !Bool
3839 } deriving (Show)
3940
4041data BuildType = Nightly | LTS BumpType
@@ -200,6 +201,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
200201 , pbEnableTests = bfEnableTests buildFlags
201202 , pbEnableLibProfiling = bfEnableLibProfile buildFlags
202203 , pbVerbose = bfVerbose buildFlags
204+ , pbAllowNewer = bfSkipCheck buildFlags
203205 }
204206
205207-- | Make a complete plan, build, test and upload bundle, docs and
@@ -214,8 +216,11 @@ completeBuild buildType buildFlags = withManager tlsManagerSettings $ \man -> do
214216 putStrLn $ "Writing build plan to: " ++ fpToText planFile
215217 encodeFile (fpToString planFile) plan
216218
217− putStrLn "Checking build plan"
218− checkBuildPlan plan
219+ if bfSkipCheck buildFlags
220+ then putStrLn "Skipping build plan check"
221+ else do
222+ putStrLn "Checking build plan"
223+ checkBuildPlan plan
219224
220225 putStrLn "Performing build"
221226 performBuild (getPerformBuild buildFlags settings) >>= mapM_ putStrLn
Stackage/PerformBuild.hs+3
@@ -64,6 +64,8 @@ data PerformBuild = PerformBuild
6464 , pbEnableTests :: Bool
6565 , pbEnableLibProfiling :: Bool
6666 , pbVerbose :: Bool
67+ , pbAllowNewer :: Bool
68+ -- ^ Pass --allow-newer to cabal configure
6769 }
6870
6971data PackageInfo = PackageInfo
@@ -293,6 +295,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
293295 withBinaryFile (fpToString fp) WriteMode inner'
294296
295297 configArgs = ($ []) $ execWriter $ do
298+ when pbAllowNewer $ tell' "--allow-newer"
296299 tell' "--package-db=clear"
297300 tell' "--package-db=global"
298301 forM_ (pbDatabase pb) $ \db -> tell' $ "--package-db=" ++ fpToText db
app/stackage.hs+4−1
@@ -78,7 +78,10 @@ main =
7878 help "Enable profiling when building") <*>
7979 switch
8080 (long "verbose" <> short 'v' <>
81− help "Output verbose detail about the build steps")
81+ help "Output verbose detail about the build steps") <*>
82+ switch
83+ (long "skip-check" <>
84+ help "Skip the check phase, and pass --allow-newer to cabal configure")
8285
8386 nightlyUploadFlags = fromString <$> strArgument
8487 (metavar "DATE" <>
stackage.cabal+1−1
@@ -1,5 +1,5 @@
11name: stackage
2−version: 0.4.1
2+version: 0.5.0
33synopsis: "Stable Hackage," tools for creating a vetted set of packages from Hackage.
44description: Please see <http://www.stackage.org/package/stackage> for a description and documentation.
55homepage: https://github.com/fpco/stackage