summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-06-18 15:21:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-06-18 15:24:18 -0400
commitbb83e52e4bc30f86f7901407cd08820deb848285 (patch)
treec001d2828d22898abdfb949e3c87be680206e238 /Build
parentafd727203041bf2565fff2b7de7e5ccea21151bc (diff)
make DistributionUpdate download build-version files and use them in the info files
Also automated downloading the builds, finally. I had done it by hand until now. Note that the Windows autobuilder has an expired cert, so it will refuse to download from it currently. I have emailed its admin to get that fixed, hopefully. This commit was sponsored by Peter Hogg.
Diffstat (limited to 'Build')
-rw-r--r--Build/DistributionUpdate.hs85
-rw-r--r--Build/Version.hs6
2 files changed, 76 insertions, 15 deletions
diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs
index dd3cce0ab..630ce0f9d 100644
--- a/Build/DistributionUpdate.hs
+++ b/Build/DistributionUpdate.hs
@@ -1,6 +1,9 @@
-{- Builds distributon info files for each git-annex release in a directory
- - tree, which must itself be part of a git-annex repository. Only files
- - that are present have their info file created.
+{- Downloads git-annex autobuilds and installs them into the git-annex
+ - repository in ~/lib/downloads that is used to distribute git-annex
+ - releases.
+ -
+ - Generates info files, containing the version (of the corresponding file
+ - from the autobuild).
-
- Also gpg signs the files.
-}
@@ -9,25 +12,82 @@ import Common.Annex
import Types.Distribution
import Build.Version
import Utility.UserInfo
-import Utility.Path
+import Utility.Url
import qualified Git.Construct
import qualified Annex
import Annex.Content
import Backend
import Git.Command
+import Data.Default
import Data.Time.Clock
-- git-annex distribution signing key (for Joey Hess)
signingKey :: String
signingKey = "89C809CB"
+-- URL to an autobuilt git-annex file, and the place to install
+-- it in the repository.
+autobuilds :: [(URLString, FilePath)]
+autobuilds =
+ (map linuxarch ["i386", "amd64", "armel"]) ++
+ (map androidversion ["4.0", "4.3"]) ++
+ [ ("https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks/git-annex.dmg", "OSX/current/10.9_Mavericks")
+ , ("https://qa.nest-initiative.org/view/msysGit/job/msysgit-git-annex-assistant-test/lastSuccessfulBuild/artifact/git-annex/git-annex-installer.exe", "windows/current/git-annex-installer.exe")
+ ]
+ where
+ linuxarch a =
+ ( "https://downloads.kitenet.net/git-annex/autobuild/i386/git-annex-standalone-" ++ a ++ ".tar.gz"
+ , "git-annex/linux/current/git-annex-standalone-" ++ a ++ ".tar.gz"
+ )
+ androidversion v =
+ ( "http://downloads.kitenet.net/git-annex/autobuild/android/" ++ v ++ "/git-annex.apk"
+ , "android/current/" ++ v ++ "/git-annex.apk"
+ )
+
+main :: IO ()
main = do
- state <- Annex.new =<< Git.Construct.fromPath =<< getRepoDir
- Annex.eval state makeinfos
+ repodir <- getRepoDir
+ updated <- catMaybes <$> mapM (getbuild repodir) autobuilds
+ state <- Annex.new =<< Git.Construct.fromPath repodir
+ Annex.eval state (makeinfos updated)
+
+-- Download a build from the autobuilder, and return its version.
+-- It's very important that the version matches the build, otherwise
+-- auto-upgrades can loop reatedly. So, check build-version before
+-- and after downloading the file.
+getbuild :: FilePath -> (URLString, FilePath) -> IO (Maybe (FilePath, Version))
+getbuild repodir (url, f) = do
+ bv1 <- getbv
+ createDirectoryIfMissing True repodir
+ let dest = repodir </> f
+ let tmp = dest ++ ".tmp"
+ nukeFile tmp
+ ifM (download url tmp def)
+ ( do
+ bv2 <- getbv
+ case bv2 of
+ Nothing -> return Nothing
+ (Just v)
+ | bv2 == bv1 -> do
+ nukeFile dest
+ renameFile tmp dest
+ -- remove git rev part of version
+ let v' = takeWhile (/= '-') v
+ return $ Just (f, v')
+ | otherwise -> do
+ nukeFile tmp
+ error $ "build version changed while downloading " ++ url ++ " " ++ show (bv1, bv2)
+ , return Nothing
+ )
+ where
+ getbv = do
+ bv <- catchDefaultIO "" $
+ readProcess "curl" [takeDirectory url ++ "build-version"]
+ return $ if null bv then Nothing else Just bv
-makeinfos :: Annex ()
-makeinfos = do
+makeinfos :: [(FilePath, Version)] -> Annex ()
+makeinfos updated = do
version <- liftIO getChangelogVersion
void $ inRepo $ runBool
[ Param "commit"
@@ -37,9 +97,8 @@ makeinfos = do
]
basedir <- liftIO getRepoDir
now <- liftIO getCurrentTime
- liftIO $ putStrLn $ "building info files for version " ++ version ++ " in " ++ basedir
- fs <- liftIO $ dirContentsRecursiveSkipping (const False) True (basedir </> "git-annex")
- forM_ fs $ \f -> do
+ liftIO $ putStrLn $ "building info files in " ++ basedir
+ forM_ updated $ \(f, bv) -> do
v <- lookupFile f
case v of
Nothing -> noop
@@ -49,7 +108,7 @@ makeinfos = do
liftIO $ writeFile infofile $ show $ GitAnnexDistribution
{ distributionUrl = mkUrl basedir f
, distributionKey = k
- , distributionVersion = version
+ , distributionVersion = bv
, distributionReleasedate = now
, distributionUrgentUpgrade = Nothing
}
@@ -70,7 +129,7 @@ makeinfos = do
, Params "sync"
]
- {- Check for out of date info files. -}
+ -- Check for out of date info files.
infos <- liftIO $ filter (".info" `isSuffixOf`)
<$> dirContentsRecursive (basedir </> "git-annex")
ds <- liftIO $ forM infos (readish <$$> readFile)
diff --git a/Build/Version.hs b/Build/Version.hs
index 0bcb4a520..71836a17b 100644
--- a/Build/Version.hs
+++ b/Build/Version.hs
@@ -14,6 +14,8 @@ import Build.TestConfig
import Utility.Monad
import Utility.Exception
+type Version = String
+
{- Set when making an official release. (Distribution vendors should set
- this too.) -}
isReleaseBuild :: IO Bool
@@ -25,7 +27,7 @@ isReleaseBuild = isJust <$> catchMaybeIO (getEnv "RELEASE_BUILD")
-
- If git or a git repo is not available, or something goes wrong,
- or this is a release build, just use the version from the changelog. -}
-getVersion :: IO String
+getVersion :: IO Version
getVersion = do
changelogversion <- getChangelogVersion
ifM (isReleaseBuild)
@@ -41,7 +43,7 @@ getVersion = do
else return $ concat [ major, ".", autoversion ]
)
-getChangelogVersion :: IO String
+getChangelogVersion :: IO Version
getChangelogVersion = do
changelog <- readFile "debian/changelog"
let verline = takeWhile (/= '\n') changelog