stackage-curator 0.9.0 → 0.10.0
raw patch · 6 files changed
+18/−4 lines, 6 filesdep ~stackage-types
Dependency ranges changed: stackage-types
Files
- ChangeLog.md +4/−0
- Stackage/BuildConstraints.hs +3/−0
- Stackage/PerformBuild.hs +6/−1
- Stackage/UpdateBuildPlan.hs +1/−0
- stackage-curator.cabal +2/−2
- test/Stackage/BuildPlanSpec.hs +2/−1
ChangeLog.md view
@@ -1,3 +1,7 @@+## 0.10.0++* Added `pcSkipBuild`+ ## 0.8.2 * `upload-docs` command
Stackage/BuildConstraints.hs view
@@ -104,6 +104,7 @@ data ConstraintFile = ConstraintFile { cfPackageFlags :: Map PackageName (Map FlagName Bool) , cfSkippedTests :: Set PackageName+ , cfSkippedBuilds :: Set PackageName , cfExpectedTestFailures :: Set PackageName , cfExpectedHaddockFailures :: Set PackageName , cfSkippedBenchmarks :: Set PackageName@@ -117,6 +118,7 @@ parseJSON = withObject "ConstraintFile" $ \o -> do cfPackageFlags <- (goPackageMap . fmap goFlagMap) <$> o .: "package-flags" cfSkippedTests <- getPackages o "skipped-tests"+ cfSkippedBuilds <- getPackages o "skipped-builds" <|> return mempty cfExpectedTestFailures <- getPackages o "expected-test-failures" cfExpectedHaddockFailures <- getPackages o "expected-haddock-failures" cfSkippedBenchmarks <- getPackages o "skipped-benchmarks"@@ -184,5 +186,6 @@ | otherwise = ExpectSuccess pcFlagOverrides = fromMaybe mempty $ lookup name cfPackageFlags+ pcSkipBuild = name `member` cfSkippedBuilds bcGithubUsers = cfGithubUsers
Stackage/PerformBuild.hs view
@@ -342,7 +342,9 @@ tell' $ "--libdir=" ++ fpToText (pbLibDir pb) tell' $ "--bindir=" ++ fpToText (pbBinDir pb) tell' $ "--datadir=" ++ fpToText (pbDataDir pb)- tell' $ "--docdir=" ++ fpToText (pbDocDir pb)+ tell' $ "--docdir=" ++ fpToText (pbDocDir pb </> fpFromText namever)+ tell' $ "--htmldir=" ++ fpToText (pbDocDir pb </> fpFromText namever)+ tell' $ "--haddockdir=" ++ fpToText (pbDocDir pb </> fpFromText namever) tell' $ "--flags=" ++ flags when (pbEnableLibProfiling && pcEnableLibProfile) $ tell' "--enable-library-profiling"@@ -385,6 +387,7 @@ prevBuildResult <- getPreviousResult pb Build pident toBuild <- case () of ()+ | pcSkipBuild -> return False | prevBuildResult /= PRSuccess -> return True | pname `notMember` registeredPackages && hasLib -> do log' $ concat@@ -419,6 +422,7 @@ let needHaddock = pbEnableHaddock && checkPrevResult prevHaddockResult pcHaddocks && not (null $ sdModules $ ppDesc $ piPlan sbPackageInfo)+ && not pcSkipBuild when needHaddock $ withConfiged $ do log' $ "Haddocks " ++ namever hfs <- readTVarIO sbHaddockFiles@@ -477,6 +481,7 @@ prevTestResult <- getPreviousResult pb Test pident let needTest = pbEnableTests && checkPrevResult prevTestResult pcTests+ && not pcSkipBuild when needTest $ withUnpacked $ do log' $ "Test configure " ++ namever run "cabal" $ "configure" : "--enable-tests" : configArgs
Stackage/UpdateBuildPlan.hs view
@@ -35,6 +35,7 @@ , pcBuildBenchmarks = maybe True pcBuildBenchmarks moldPC , pcFlagOverrides = maybe mempty pcFlagOverrides moldPC , pcEnableLibProfile = maybe True pcEnableLibProfile moldPC+ , pcSkipBuild = maybe False pcSkipBuild moldPC } where moldBP = lookup name bpPackages
stackage-curator.cabal view
@@ -1,5 +1,5 @@ name: stackage-curator-version: 0.9.0+version: 0.10.0 synopsis: Tools for curating Stackage bundles description: Please see <http://www.stackage.org/package/stackage-curator> for a description and documentation. homepage: https://github.com/fpco/stackage@@ -71,7 +71,7 @@ , semigroups , xml-conduit < 1.3 , conduit- , stackage-types >= 1.0.1+ , stackage-types >= 1.1 , monad-unlift >= 0.1.1 , blaze-html
test/Stackage/BuildPlanSpec.hs view
@@ -118,7 +118,8 @@ ,pcHaddocks = Don'tBuild ,pcBuildBenchmarks = False ,pcFlagOverrides = mempty- ,pcEnableLibProfile = False}+ ,pcEnableLibProfile = False+ ,pcSkipBuild = False} ,ppDesc = SimpleDesc {sdPackages = deps