Have uploader specify the nightly day

This commit is contained in:
Michael Snoyman 2015-05-11 07:47:42 +03:00
parent 9c57579caa
commit cb85530cfa
3 changed files with 28 additions and 1090 deletions

View File

@ -115,38 +115,39 @@ doUpload status uid ident bundleFP = do
<*> yaml "docs-map.yaml" <*> yaml "docs-map.yaml"
now <- liftIO getCurrentTime now <- liftIO getCurrentTime
let day = tshow $ utctDay now
let theSiGhcVersion = siGhcVersion $ bpSystemInfo siPlan let theSiGhcVersion = siGhcVersion $ bpSystemInfo siPlan
ghcVersion = display theSiGhcVersion ghcVersion = display theSiGhcVersion
ghcMajorVersionMay = case versionBranch theSiGhcVersion of ghcMajorVersionMay = case versionBranch theSiGhcVersion of
(a:b:_) -> Just (GhcMajorVersion a b) (a:b:_) -> Just (GhcMajorVersion a b)
_ -> Nothing _ -> Nothing
slug' = slug' <-
case siType of case siType of
STNightly -> "nightly-" ++ day STNightly -> invalidArgs ["No longer support STNightly, use STNightly2"]
STLTS major minor -> concat STNightly2 day -> return $ "nightly-" ++ tshow day
[ "lts-" STLTS major minor -> return $ concat
, tshow major [ "lts-"
, "." , tshow major
, tshow minor , "."
] , tshow minor
title = ]
case siType of title <-
STNightly -> concat case siType of
[ "Stackage Nightly " STNightly -> invalidArgs ["No longer support STNightly, use STNightly2"]
, day STNightly2 day -> return $ concat
, ", GHC " [ "Stackage Nightly "
, ghcVersion , tshow day
] , ", GHC "
STLTS major minor -> concat , ghcVersion
[ "LTS Haskell " ]
, tshow major STLTS major minor -> return $ concat
, "." [ "LTS Haskell "
, tshow minor , tshow major
, ", GHC " , "."
, ghcVersion , tshow minor
] , ", GHC "
, ghcVersion
]
slug <- do slug <- do
slug2 <- mkSlug slug' slug2 <- mkSlug slug'

File diff suppressed because it is too large Load Diff

View File

@ -168,7 +168,7 @@ library
, deepseq , deepseq
, deepseq-generics , deepseq-generics
, auto-update , auto-update
, stackage-types , stackage-types >= 1.0.1
, stackage-build-plan >= 0.1.1 , stackage-build-plan >= 0.1.1
, yesod-sitemap , yesod-sitemap
, streaming-commons , streaming-commons