mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-07-20 02:41:31 +00:00
core: remove build timestamp from the version info (reproducible builds) (#2182)
* core: remove build timestamp from the version info (reproducible builds) * remove strings
This commit is contained in:
+1
-1
@@ -1467,7 +1467,7 @@ processChatCommand = \case
|
||||
p {groupPreferences = Just . setGroupPreference' SGFTimedMessages pref $ groupPreferences p}
|
||||
QuitChat -> liftIO exitSuccess
|
||||
ShowVersion -> do
|
||||
let versionInfo = coreVersionInfo $(buildTimestampQ) $(simplexmqCommitQ)
|
||||
let versionInfo = coreVersionInfo $(simplexmqCommitQ)
|
||||
chatMigrations <- map upMigration <$> withStore' Migrations.getCurrent
|
||||
agentMigrations <- withAgent getAgentMigrations
|
||||
pure $ CRVersionInfo {versionInfo, chatMigrations, agentMigrations}
|
||||
|
||||
@@ -33,8 +33,7 @@ import Data.Map.Strict (Map)
|
||||
import Data.String
|
||||
import Data.Text (Text)
|
||||
import Data.Time (ZonedTime)
|
||||
import Data.Time.Clock (UTCTime, getCurrentTime)
|
||||
import Data.Time.Format (defaultTimeLocale, formatTime, iso8601DateFormat)
|
||||
import Data.Time.Clock (UTCTime)
|
||||
import Data.Version (showVersion)
|
||||
import GHC.Generics (Generic)
|
||||
import Language.Haskell.TH (Exp, Q, runIO)
|
||||
@@ -73,11 +72,6 @@ versionString version = "SimpleX Chat v" <> version
|
||||
updateStr :: String
|
||||
updateStr = "To update run: curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/install.sh | bash"
|
||||
|
||||
buildTimestampQ :: Q Exp
|
||||
buildTimestampQ = do
|
||||
s <- formatTime defaultTimeLocale (iso8601DateFormat $ Just "%H:%M:%S") <$> runIO getCurrentTime
|
||||
[|fromString s|]
|
||||
|
||||
simplexmqCommitQ :: Q Exp
|
||||
simplexmqCommitQ = do
|
||||
s <- either error B.unpack . A.parseOnly commitHashP <$> runIO (B.readFile "./cabal.project")
|
||||
@@ -92,11 +86,10 @@ simplexmqCommitQ = do
|
||||
*> "tag: "
|
||||
*> A.takeWhile (A.notInClass " \r\n")
|
||||
|
||||
coreVersionInfo :: String -> String -> CoreVersionInfo
|
||||
coreVersionInfo buildTimestamp simplexmqCommit =
|
||||
coreVersionInfo :: String -> CoreVersionInfo
|
||||
coreVersionInfo simplexmqCommit =
|
||||
CoreVersionInfo
|
||||
{ version = versionNumber,
|
||||
buildTimestamp,
|
||||
simplexmqVersion = simplexMQVersion,
|
||||
simplexmqCommit
|
||||
}
|
||||
@@ -724,7 +717,6 @@ data ChatLogLevel = CLLDebug | CLLInfo | CLLWarning | CLLError | CLLImportant
|
||||
|
||||
data CoreVersionInfo = CoreVersionInfo
|
||||
{ version :: String,
|
||||
buildTimestamp :: String,
|
||||
simplexmqVersion :: String,
|
||||
simplexmqCommit :: String
|
||||
}
|
||||
|
||||
@@ -1240,10 +1240,10 @@ instance ToJSON WCallCommand where
|
||||
toJSON = J.genericToJSON . taggedObjectJSON $ dropPrefix "WCCall"
|
||||
|
||||
viewVersionInfo :: ChatLogLevel -> CoreVersionInfo -> [StyledString]
|
||||
viewVersionInfo logLevel CoreVersionInfo {version, buildTimestamp, simplexmqVersion, simplexmqCommit} =
|
||||
viewVersionInfo logLevel CoreVersionInfo {version, simplexmqVersion, simplexmqCommit} =
|
||||
map plain $
|
||||
if logLevel <= CLLInfo
|
||||
then [versionString version <> parens buildTimestamp, updateStr, "simplexmq: " <> simplexmqVersion <> parens simplexmqCommit]
|
||||
then [versionString version, updateStr, "simplexmq: " <> simplexmqVersion <> parens simplexmqCommit]
|
||||
else [versionString version, updateStr]
|
||||
where
|
||||
parens s = " (" <> s <> ")"
|
||||
|
||||
Reference in New Issue
Block a user