[DDW-1083] Don’t use inputs.self.revCount (not available in Cicero)

Author: michalrus

.eslintrc

@@ -101,7 +101,7 @@
     "NETWORK": true,
     "BUILD_REV": true,
     "BUILD_REV_SHORT": true,
-    "BUILD_REV_COUNT": true,
+    "BUILD_COUNTER": true,
     "Process": true // TODO: remove after fix
   },
   "settings": {

installers/Installer.hs

@@ -33,7 +33,7 @@ main = do
     BuildkiteCrossWin -> do
       fullVersion <- getAppVersion "../package.json"
       installerConfig <- decodeFileThrow "installer-config.json"
-      let fullName = packageFileName (uglyName installerConfig) Win64 (oCluster options') fullVersion (oBackend options') (oBuildJob options') (oBuildRevCount options')
+      let fullName = packageFileName (uglyName installerConfig) Win64 (oCluster options') fullVersion (oBackend options') (oBuildJob options') (oBuildCounter options')
       WindowsInstaller.writeInstallerNSIS fullName fullVersion installerConfig options' (oCluster options')
       WindowsInstaller.writeUninstallerNSIS fullVersion installerConfig
 -- | The contract of `genSignedInstaller` is not to produce unsigned installer binaries.

installers/common/Config.hs

@@ -59,7 +59,7 @@ data Command
 data Options = Options
   { oBackend               :: Backend
   , oBuildJob              :: Maybe BuildJob
-  , oBuildRevCount         :: Maybe BuildJob
+  , oBuildCounter         :: Maybe BuildJob
   , oOS                    :: OS
   , oCluster               :: Cluster
   , oAppName               :: AppName
@@ -85,7 +85,7 @@ optionsParser detectedOS = Options
   <*> (optional      $
       (BuildJob     <$> optText "build-rev-short"     'b' "CI Build Job/ID"))
   <*> (optional      $
-      (BuildJob     <$> optText "build-rev-count"     'v' "‘inputs.self.sourceInfo.revCount’"))
+      (BuildJob     <$> optText "build-counter"     'v' "‘inputs.self.sourceInfo.revCount’"))
   <*> (fromMaybe detectedOS <$> (optional $
                    optReadLower "os"                  's' "OS, defaults to host OS.  One of:  linux64 macos64 win64"))
   <*> (fromMaybe Selfnode   <$> (optional $

installers/common/MacInstaller.hs

@@ -42,7 +42,7 @@ data DarwinConfig = DarwinConfig {
 
 -- | The contract of `main` is not to produce unsigned installer binaries.
 main :: Options -> IO ()
-main opts@Options{oCodeSigningConfigPath,oAppRootOverride,oDontPkgbuild,oSigningConfigPath,oCluster,oBackend,oBuildJob,oBuildRevCount,oOutputDir,oTestInstaller} = do
+main opts@Options{oCodeSigningConfigPath,oAppRootOverride,oDontPkgbuild,oSigningConfigPath,oCluster,oBackend,oBuildJob,oBuildCounter,oOutputDir,oTestInstaller} = do
 
   installerConfig <- decodeFileThrow "installer-config.json"
 
@@ -77,7 +77,7 @@ main opts@Options{oCodeSigningConfigPath,oAppRootOverride,oDontPkgbuild,oSigning
   makeComponentRoot opts appRoot darwinConfig installerConfig
   daedalusVer <- getAppVersion "../package.json"
 
-  let pkg = packageFileName (uglyName installerConfig) Macos64 oCluster daedalusVer oBackend oBuildJob oBuildRevCount
+  let pkg = packageFileName (uglyName installerConfig) Macos64 oCluster daedalusVer oBackend oBuildJob oBuildCounter
       opkg = oOutputDir </> pkg
 
   print "appRoot:"

installers/common/Types.hs

@@ -117,10 +117,10 @@ clusterNetwork Preprod = "preprod"
 clusterNetwork Preview = "preview"
 
 packageFileName :: Text -> OS -> Cluster -> Version -> Backend -> Maybe BuildJob -> Maybe BuildJob -> FilePath
-packageFileName uglyName _os cluster ver backend buildJob buildRevCount = fromText name <.> ext
+packageFileName uglyName _os cluster ver backend buildJob buildCounter = fromText name <.> ext
   where
     name = T.intercalate "-" parts
-    parts = [uglyName, fromVer ver <> buildRevCount', lshowText cluster] ++ buildJob' ++ [archOS]
+    parts = [uglyName, fromVer ver <> buildCounter', lshowText cluster] ++ buildJob' ++ [archOS]
     _backend' = case backend of
                  Cardano _ -> "cardano-wallet"
     ext = case _os of
@@ -139,7 +139,7 @@ packageFileName uglyName _os cluster ver backend buildJob buildRevCount = fromTe
               else "x86_64-darwin"
             Linux64 -> "x86_64-linux"
     buildJob' = maybe [] (\b -> [fromBuildJob b]) buildJob
-    buildRevCount' = "." <> maybe "0" fromBuildJob buildRevCount
+    buildCounter' = "." <> maybe "0" fromBuildJob buildCounter
 
 instance FromJSON Version where
   parseJSON = withObject "Package" $ \o -> Version <$> o .: "version"

installers/common/WindowsInstaller.hs

@@ -309,7 +309,7 @@ main opts@Options{..}  = do
     echo "Packaging frontend"
     packageFrontend oCluster installerConfig
 
-    let fullName = packageFileName (uglyName installerConfig) Win64 oCluster fullVersion oBackend oBuildJob oBuildRevCount
+    let fullName = packageFileName (uglyName installerConfig) Win64 oCluster fullVersion oBackend oBuildJob oBuildCounter
 
     printf ("Building: "%fp%"\n") fullName
 

nix/any-darwin.nix

@@ -17,7 +17,7 @@ let
 
   archSuffix = if pkgs.system == "aarch64-darwin" then "arm64" else "x64";
   packageVersion = originalPackageJson.version;
-  installerName = "daedalus-${packageVersion}.${toString sourceLib.buildRevCount}-${cluster}-${sourceLib.buildRevShort}-${pkgs.system}";
+  installerName = "daedalus-${packageVersion}.${toString sourceLib.buildCounter}-${cluster}-${sourceLib.buildRevShort}-${pkgs.system}";
 
 in rec {
 
@@ -124,7 +124,7 @@ in rec {
     NETWORK = cluster;
     BUILD_REV = sourceLib.buildRev;
     BUILD_REV_SHORT = sourceLib.buildRevShort;
-    BUILD_REV_COUNT = sourceLib.buildRevCount;
+    BUILD_COUNTER = sourceLib.buildCounter;
     CARDANO_WALLET_VERSION = cardanoWalletVersion;
     CARDANO_NODE_VERSION = cardanoNodeVersion;
     configurePhase = newCommon.setupCacheAndGypDirs + darwinSpecificCaches + ''
@@ -147,7 +147,7 @@ in rec {
 
         make-installer --cardano ${daedalus-bridge} \
           --build-rev-short ${sourceLib.buildRevShort} \
-          --build-rev-count ${toString sourceLib.buildRevCount} \
+          --build-counter ${toString sourceLib.buildCounter} \
           --cluster ${cluster} \
           --out-dir doesnt-matter \
           --dont-pkgbuild

nix/source-lib.nix

@@ -23,8 +23,26 @@ in rec {
 
   forEachCluster = forEach allClusters;
 
-  buildRev = if inputs.self ? revCount then inputs.self.rev else "0000000000000000000000000000000000000000";
-  buildRevShort = if inputs.self ? revCount then builtins.substring 0 9 buildRev else "dirty";
-  buildRevCount = inputs.self.revCount or 0;
+  # When did the project start? → `git show --no-patch --date=unix $(git rev-list --max-parents=0 HEAD)`
+  daedalusEpoch = 1475675335;
+
+  # In `std`, we don’t get `inputs.self.sourceInfo`. Instead, when Git
+  # status is dirty, we get only `.rev = "not-a-commit"`. When clean,
+  # we get all normal attributes. Cf.
+  # <https://github.com/divnix/std/blob/d2bde49f82331db61ebabf7d0b7441a31364908a/src/grow.nix#L184>.
+
+  buildRev =
+    if inputs.self ? shortRev
+    then inputs.self.rev
+    else "0000000000000000000000000000000000000000";
+  buildRevShort =
+    if inputs.self ? shortRev
+    then builtins.substring 0 9 buildRev
+    else "dirty";
+  # XXX: inputs.self.revCount is not available in Cicero, let’s use a counter incrementing every hour:
+  buildCounter =
+    if inputs.self ? shortRev
+    then (inputs.self.lastModified - daedalusEpoch) / (60 * 60)
+    else 0;
 
 }

nix/x86_64-linux.nix

@@ -89,7 +89,7 @@ in rec {
     NETWORK = oldCode.launcherConfigs.launcherConfig.networkName;
     BUILD_REV = sourceLib.buildRev;
     BUILD_REV_SHORT = sourceLib.buildRevShort;
-    BUILD_REV_COUNT = sourceLib.buildRevCount;
+    BUILD_COUNTER = sourceLib.buildCounter;
     NODE_ENV = "production";
     BUILDTYPE = "Release";
     configurePhase = newCommon.setupCacheAndGypDirs + linuxSpecificCaches + ''
@@ -283,7 +283,7 @@ in rec {
 
     wrappedBundle = let
       version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
-      fn = "daedalus-${version}.${toString sourceLib.buildRevCount}-${linuxClusterBinName}-${sourceLib.buildRevShort}-x86_64-linux.bin";
+      fn = "daedalus-${version}.${toString sourceLib.buildCounter}-${linuxClusterBinName}-${sourceLib.buildRevShort}-x86_64-linux.bin";
     in pkgs.runCommand fn {} ''
       mkdir -p $out
       cp ${newBundle} $out/${fn}

nix/x86_64-windows.nix

@@ -51,7 +51,7 @@ in rec {
     NETWORK = launcherConfigs.launcherConfig.networkName;
     BUILD_REV = sourceLib.buildRev;
     BUILD_REV_SHORT = sourceLib.buildRevShort;
-    BUILD_REV_COUNT = sourceLib.buildRevCount;
+    BUILD_COUNTER = sourceLib.buildCounter;
     NODE_ENV = "production";
     BUILDTYPE = "Release";
     configurePhase = newCommon.setupCacheAndGypDirs + ''
@@ -228,7 +228,7 @@ in rec {
       -o $out \
       --cluster ${cluster} \
       --build-rev-short ${sourceLib.buildRevShort} \
-      --build-rev-count ${toString sourceLib.buildRevCount} \
+      --build-counter ${toString sourceLib.buildCounter} \
       buildkite-cross
 
     mkdir $out
@@ -330,7 +330,7 @@ in rec {
   signed-windows-installer = let
     backend_version = oldCode.cardanoWalletVersion;
     frontend_version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
-    fullName = "daedalus-${frontend_version}.${toString sourceLib.buildRevCount}-${cluster}-${sourceLib.buildRevShort}-x86_64-windows.exe"; # must match to packageFileName in make-installer
+    fullName = "daedalus-${frontend_version}.${toString sourceLib.buildCounter}-${cluster}-${sourceLib.buildRevShort}-x86_64-windows.exe"; # must match to packageFileName in make-installer
   in pkgs.runCommand "signed-windows-installer-${cluster}" {} ''
     mkdir $out
     cp -v ${signFile "${unsigned-windows-installer}/${fullName}"} $out/${fullName}