Skip to content

BuildClient: Run tests with latest revision #1479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TuongNM wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −9
Open

BuildClient: Run tests with latest revision #1479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions exes/BuildClient.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ processPkg verbosity opts config docInfo = do
createDirectoryIfMissing True $ resultsDirectory opts
notice verbosity $ "Writing cabal.project for " ++ display (docInfoPackage docInfo)
let projectFile = installDirectory opts </> "cabal.project"
cabal opts "unpack" [show (docInfoTarGzURI config docInfo)] Nothing
cabal opts "unpack" [cabalPackageTarget config docInfo] Nothing
writeFile projectFile $ "packages: */*.cabal" -- ++ show (docInfoTarGzURI config docInfo)

setTestOutcome :: String -> [String] -> [String]
Expand Down Expand Up @@ -756,14 +756,7 @@ buildPackage verbosity opts config docInfo = do
"--haddock-hoogle",
-- Generate the quickjump index files
"--haddock-option=--quickjump",
-- For candidates we need to use the full URL, because
-- otherwise cabal-install will not find the package.
-- For regular packages however we need to use just the
-- package name, otherwise cabal-install will not
-- generate a report
if docInfoIsCandidate docInfo
then show (docInfoTarGzURI config docInfo)
else display pkgid
cabalPackageTarget config docInfo
]

-- The installDirectory is purely temporary, while the resultsDirectory is
Expand Down Expand Up @@ -830,6 +823,18 @@ cabal opts cmd args moutput = do
Nothing Nothing moutput moutput
waitForProcess ph

cabalPackageTarget :: BuildConfig -> DocInfo -> String
cabalPackageTarget config docInfo =
-- For candidates we need to use the full URL, because
-- otherwise cabal install/unpack will not find the package.
-- For regular packages however we need to use just the
-- package name, otherwise cabal install will not
-- generate a report and cabal unpack will not use the
-- latest cabal file revision from the package archive.
if docInfoIsCandidate docInfo
then show (docInfoTarGzURI config docInfo)
else display (docInfoPackage docInfo)

pruneHaddockFiles :: FilePath -> IO ()
pruneHaddockFiles dir = do
-- Hackage doesn't support the haddock frames view, so remove it
Expand Down
Loading