From c63c970148a057055674a20336acfcde81a3aa43 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 4 Jun 2018 20:05:35 -0400 Subject: [PATCH 1/6] [DEVOPS-877] Add LOCALE_ARCHIVE to connect-to-cluster script (#3039) --- scripts/launch/connect-to-cluster/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/launch/connect-to-cluster/default.nix b/scripts/launch/connect-to-cluster/default.nix index b3f87be14fc..a5760e258ed 100755 --- a/scripts/launch/connect-to-cluster/default.nix +++ b/scripts/launch/connect-to-cluster/default.nix @@ -64,6 +64,7 @@ in pkgs.writeScript "${executable}-connect-to-${environment}" '' echo "Deleting ${stateDir} ... " rm -Rf ${stateDir} fi + export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"; echo "Keeping state in ${stateDir}" mkdir -p ${stateDir}/logs From 37383eaf92371cc2d662fa31ff4648fedd3330dd Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 31 May 2018 14:06:20 -0400 Subject: [PATCH 2/6] [DEVOPS-872] add launcher lockfile --- pkgs/default.nix | 25 ++++----- tools/cardano-sl-tools.cabal | 1 + tools/src/launcher/Main.hs | 70 +++++++++++++++---------- tools/src/launcher/launcher-config.yaml | 3 ++ 4 files changed, 58 insertions(+), 41 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index dc6d1b4f33e..fd60301104a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -7494,15 +7494,16 @@ inherit (pkgs) mesa;}; , cardano-sl-ssc, cardano-sl-txp, cardano-sl-update , cardano-sl-util, cardano-sl-wallet, Chart, Chart-diagrams , conduit, containers, cpphs, cryptonite, data-default, directory - , ed25519, fgl, filepath, foldl, formatting, Glob, graphviz, hspec - , hspec-discover, kademlia, lens, lifted-async, log-warper - , MonadRandom, mtl, neat-interpolation, network-transport-tcp - , optparse-applicative, optparse-generic, parsec, parsers, pipes - , pipes-bytestring, pipes-interleave, pipes-safe, process - , QuickCheck, random, random-shuffle, safe-exceptions - , serokell-util, silently, stdenv, stm, string-conv, tabl, tar - , temporary, text, time, time-units, trifecta, universum, unix - , unix-compat, unordered-containers, vector, yaml + , ed25519, fgl, filelock, filepath, foldl, formatting, Glob + , graphviz, hspec, hspec-discover, kademlia, lens, lifted-async + , log-warper, MonadRandom, mtl, neat-interpolation + , network-transport-tcp, optparse-applicative, optparse-generic + , parsec, parsers, pipes, pipes-bytestring, pipes-interleave + , pipes-safe, process, QuickCheck, random, random-shuffle + , safe-exceptions, serokell-util, silently, stdenv, stm + , string-conv, tabl, tar, temporary, text, time, time-units + , trifecta, universum, unix, unix-compat, unordered-containers + , vector, yaml }: mkDerivation { pname = "cardano-sl-tools"; @@ -7522,9 +7523,9 @@ inherit (pkgs) mesa;}; cardano-sl-infra cardano-sl-lrc cardano-sl-networking cardano-sl-ssc cardano-sl-txp cardano-sl-update cardano-sl-util cardano-sl-wallet Chart Chart-diagrams conduit containers - cryptonite data-default directory ed25519 fgl filepath foldl - formatting Glob graphviz kademlia lens lifted-async log-warper - MonadRandom mtl neat-interpolation network-transport-tcp + cryptonite data-default directory ed25519 fgl filelock filepath + foldl formatting Glob graphviz kademlia lens lifted-async + log-warper MonadRandom mtl neat-interpolation network-transport-tcp optparse-applicative optparse-generic parsec parsers pipes pipes-bytestring pipes-interleave pipes-safe process QuickCheck random random-shuffle safe-exceptions serokell-util silently stm diff --git a/tools/cardano-sl-tools.cabal b/tools/cardano-sl-tools.cabal index f6d9708a6b8..609beed897e 100644 --- a/tools/cardano-sl-tools.cabal +++ b/tools/cardano-sl-tools.cabal @@ -314,6 +314,7 @@ executable cardano-launcher , containers , directory , filepath + , filelock , formatting , lens , lifted-async diff --git a/tools/src/launcher/Main.hs b/tools/src/launcher/Main.hs index 7a754906029..5e49252fc03 100644 --- a/tools/src/launcher/Main.hs +++ b/tools/src/launcher/Main.hs @@ -42,6 +42,7 @@ import System.Directory (createDirectoryIfMissing, doesFileExist, remo import qualified System.Directory as Sys import System.Environment (getExecutablePath, getProgName, setEnv) import System.Exit (ExitCode (..)) +import System.FileLock (tryLockFile, unlockFile, SharedExclusive (Exclusive)) import System.FilePath (takeDirectory, ()) import qualified System.Info as Sys import qualified System.IO as IO @@ -85,6 +86,7 @@ import Launcher.Logging (reportErrorDefault) data LauncherOptions = LO { loNodePath :: !FilePath , loNodeArgs :: ![Text] + , loStatePath :: !FilePath , loNodeDbPath :: !FilePath , loNodeLogConfig :: !(Maybe FilePath) , loNodeLogPath :: !(Maybe FilePath) @@ -288,35 +290,45 @@ main = set Log.ltFiles [Log.HandlerWrap "launcher" Nothing] . set Log.ltSeverity (Just Log.debugPlus) logException loggerName . Log.usingLoggerName loggerName $ - withConfigurations loConfiguration $ \_ -> - case loWalletPath of - Nothing -> do - logNotice "LAUNCHER STARTED" - logInfo "Running in the server scenario" - serverScenario - (NodeDbPath loNodeDbPath) - loLogsPrefix - loNodeLogConfig - (NodeData loNodePath realNodeArgs loNodeLogPath) - (UpdaterData - loUpdaterPath loUpdaterArgs loUpdateWindowsRunner loUpdateArchive) - loReportServer - logNotice "Finished serverScenario" - Just wpath -> do - logNotice "LAUNCHER STARTED" - logInfo "Running in the client scenario" - clientScenario - (NodeDbPath loNodeDbPath) - loLogsPrefix - loNodeLogConfig - (NodeData loNodePath realNodeArgs loNodeLogPath) - (NodeData wpath loWalletArgs loWalletLogPath) - (UpdaterData - loUpdaterPath loUpdaterArgs loUpdateWindowsRunner loUpdateArchive) - loNodeTimeoutSec - loReportServer - loWalletLogging - logNotice "Finished clientScenario" + withConfigurations loConfiguration $ \_ -> do + let lockFileName = loStatePath "launcher.lock" + maybeFileLock <- liftIO $ tryLockFile lockFileName Exclusive + fileLock <- case maybeFileLock of + Nothing -> do + logError $ sformat ("CRITICAL FAILURE: Lock file "%shown%" is in use! TERMINATING!") lockFileName + exitWith $ ExitFailure 1 + Just fileLock -> do + logInfo $ sformat ("Locked launcher lock file "%shown) lockFileName + return fileLock + case loWalletPath of + Nothing -> do + logNotice "LAUNCHER STARTED" + logInfo "Running in the server scenario" + serverScenario + (NodeDbPath loNodeDbPath) + loLogsPrefix + loNodeLogConfig + (NodeData loNodePath realNodeArgs loNodeLogPath) + (UpdaterData + loUpdaterPath loUpdaterArgs loUpdateWindowsRunner loUpdateArchive) + loReportServer + logNotice "Finished serverScenario" + Just wpath -> do + logNotice "LAUNCHER STARTED" + logInfo "Running in the client scenario" + clientScenario + (NodeDbPath loNodeDbPath) + loLogsPrefix + loNodeLogConfig + (NodeData loNodePath realNodeArgs loNodeLogPath) + (NodeData wpath loWalletArgs loWalletLogPath) + (UpdaterData + loUpdaterPath loUpdaterArgs loUpdateWindowsRunner loUpdateArchive) + loNodeTimeoutSec + loReportServer + loWalletLogging + logNotice "Finished clientScenario" + liftIO $ unlockFile fileLock where -- We propagate some options to the node executable, because -- we almost certainly want to use the same configuration and diff --git a/tools/src/launcher/launcher-config.yaml b/tools/src/launcher/launcher-config.yaml index b78ab8d76f4..3aa8c3d3f78 100644 --- a/tools/src/launcher/launcher-config.yaml +++ b/tools/src/launcher/launcher-config.yaml @@ -29,6 +29,9 @@ nodeArgs: - "--configuration-key" - "mainnet_dryrun_full" +# Path to directory where state is stored +statePath: ./ + # Path to directory with all DBs used by the node. The launcher # needs it to record information about installed updates. nodeDbPath: db-mainnet-staging From 1e12de1d33e3b18c3b412fd5c13f68d21c01a593 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Wed, 6 Jun 2018 10:39:04 -0400 Subject: [PATCH 3/6] [DEVOPS-872] Add statePath to launcher config for demo --- scripts/launch/demo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/launch/demo.sh b/scripts/launch/demo.sh index b2a14ea9591..05c004d35d9 100755 --- a/scripts/launch/demo.sh +++ b/scripts/launch/demo.sh @@ -172,6 +172,7 @@ while [[ $i -lt $panesCnt ]]; do echo "updaterArgs: [bash]" >> $CONFIG_PATH echo "updateArchive: $updater_file" >> $CONFIG_PATH echo "nodeTimeoutSec: 5" >> $CONFIG_PATH + echo "statePath: $run_dir" >> $CONFIG_PATH echo "configuration:" >> $CONFIG_PATH echo " filePath: lib/configuration.yaml" >> $CONFIG_PATH echo " key: default" >> $CONFIG_PATH From 4055691a91d6c690e1b47d7023f38a2c401a1f70 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Fri, 8 Jun 2018 10:39:02 -0400 Subject: [PATCH 4/6] Bump applicationVersion for 1.2.1 release (#3068) --- lib/configuration.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/configuration.yaml b/lib/configuration.yaml index fd0df46eed9..61edd56d6d7 100644 --- a/lib/configuration.yaml +++ b/lib/configuration.yaml @@ -14736,7 +14736,7 @@ mainnet_wallet_win64: &mainnet_wallet_win64 <<: *mainnet_full update: applicationName: csl-daedalus - applicationVersion: 6 + applicationVersion: 7 lastKnownBlockVersion: bvMajor: 0 bvMinor: 1 @@ -14746,7 +14746,7 @@ mainnet_wallet_macos64: &mainnet_wallet_macos64 <<: *mainnet_full update: applicationName: csl-daedalus - applicationVersion: 6 + applicationVersion: 7 lastKnownBlockVersion: bvMajor: 0 bvMinor: 1 @@ -14756,7 +14756,7 @@ mainnet_wallet_linux64: &mainnet_wallet_linux64 <<: *mainnet_full update: applicationName: csl-daedalus - applicationVersion: 6 + applicationVersion: 7 lastKnownBlockVersion: bvMajor: 0 bvMinor: 1 @@ -14781,7 +14781,7 @@ mainnet_dryrun_wallet_win64: &mainnet_dryrun_wallet_win64 <<: *mainnet_dryrun_full update: applicationName: csl-daedalus - applicationVersion: 11 + applicationVersion: 12 lastKnownBlockVersion: bvMajor: 0 bvMinor: 1 @@ -14791,7 +14791,7 @@ mainnet_dryrun_wallet_macos64: &mainnet_dryrun_wallet_macos64 <<: *mainnet_dryrun_full update: applicationName: csl-daedalus - applicationVersion: 11 + applicationVersion: 12 lastKnownBlockVersion: bvMajor: 0 bvMinor: 1 @@ -14801,7 +14801,7 @@ mainnet_dryrun_wallet_linux64: &mainnet_dryrun_wallet_linux64 <<: *mainnet_dryrun_full update: applicationName: csl-daedalus - applicationVersion: 11 + applicationVersion: 12 lastKnownBlockVersion: bvMajor: 0 bvMinor: 1 From eb5888c721ae1f6340f65b6ee81e13133c4d243f Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Fri, 8 Jun 2018 16:19:30 -0400 Subject: [PATCH 5/6] cabal version bump to 1.2.1 (#3071) --- auxx/cardano-sl-auxx.cabal | 2 +- binary/cardano-sl-binary.cabal | 2 +- block/cardano-sl-block.cabal | 2 +- client/cardano-sl-client.cabal | 2 +- core/cardano-sl-core.cabal | 2 +- crypto/cardano-sl-crypto.cabal | 2 +- db/cardano-sl-db.cabal | 2 +- delegation/cardano-sl-delegation.cabal | 2 +- explorer/cardano-sl-explorer.cabal | 2 +- generator/cardano-sl-generator.cabal | 2 +- infra/cardano-sl-infra.cabal | 2 +- lib/cardano-sl.cabal | 2 +- lrc/cardano-sl-lrc.cabal | 2 +- networking/cardano-sl-networking.cabal | 2 +- node/cardano-sl-node.cabal | 2 +- pkgs/default.nix | 44 +++++++++++++------------- ssc/cardano-sl-ssc.cabal | 2 +- tools/cardano-sl-tools.cabal | 2 +- txp/cardano-sl-txp.cabal | 2 +- update/cardano-sl-update.cabal | 2 +- util/cardano-sl-util.cabal | 2 +- wallet-new/cardano-sl-wallet-new.cabal | 2 +- wallet/cardano-sl-wallet.cabal | 2 +- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/auxx/cardano-sl-auxx.cabal b/auxx/cardano-sl-auxx.cabal index 4b9a1d70eba..280190d9841 100644 --- a/auxx/cardano-sl-auxx.cabal +++ b/auxx/cardano-sl-auxx.cabal @@ -1,5 +1,5 @@ name: cardano-sl-auxx -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - Auxx description: Cardano SL - Auxx license: MIT diff --git a/binary/cardano-sl-binary.cabal b/binary/cardano-sl-binary.cabal index d5c2de5679d..1fb097fcf6a 100644 --- a/binary/cardano-sl-binary.cabal +++ b/binary/cardano-sl-binary.cabal @@ -1,5 +1,5 @@ name: cardano-sl-binary -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - binary serialization description: This package defines a type class for binary serialization, helpers and instances. diff --git a/block/cardano-sl-block.cabal b/block/cardano-sl-block.cabal index 07089211ec5..cd2b8b81931 100644 --- a/block/cardano-sl-block.cabal +++ b/block/cardano-sl-block.cabal @@ -1,5 +1,5 @@ name: cardano-sl-block -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - block processing description: Cardano SL - block processing license: MIT diff --git a/client/cardano-sl-client.cabal b/client/cardano-sl-client.cabal index b3612fe90f5..7711b5fcede 100644 --- a/client/cardano-sl-client.cabal +++ b/client/cardano-sl-client.cabal @@ -1,5 +1,5 @@ name: cardano-sl-client -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL client modules description: Cardano SL client modules license: MIT diff --git a/core/cardano-sl-core.cabal b/core/cardano-sl-core.cabal index 65691a8b692..ebf18c255fa 100644 --- a/core/cardano-sl-core.cabal +++ b/core/cardano-sl-core.cabal @@ -1,5 +1,5 @@ name: cardano-sl-core -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - core description: Cardano SL - core license: MIT diff --git a/crypto/cardano-sl-crypto.cabal b/crypto/cardano-sl-crypto.cabal index 2269fc65500..a42e0411d4b 100644 --- a/crypto/cardano-sl-crypto.cabal +++ b/crypto/cardano-sl-crypto.cabal @@ -1,5 +1,5 @@ name: cardano-sl-crypto -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - cryptography primitives description: This package contains cryptography primitives used in Cardano SL. license: MIT diff --git a/db/cardano-sl-db.cabal b/db/cardano-sl-db.cabal index 437a984eca6..393cdca6f2d 100644 --- a/db/cardano-sl-db.cabal +++ b/db/cardano-sl-db.cabal @@ -1,5 +1,5 @@ name: cardano-sl-db -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - basic DB interfaces description: Cardano SL - basic DB interfaces license: MIT diff --git a/delegation/cardano-sl-delegation.cabal b/delegation/cardano-sl-delegation.cabal index 28ea6d226da..8f1c8582c6c 100644 --- a/delegation/cardano-sl-delegation.cabal +++ b/delegation/cardano-sl-delegation.cabal @@ -1,5 +1,5 @@ name: cardano-sl-delegation -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - delegation description: Cardano SL - delegation license: MIT diff --git a/explorer/cardano-sl-explorer.cabal b/explorer/cardano-sl-explorer.cabal index d11ed299515..d041b396f23 100644 --- a/explorer/cardano-sl-explorer.cabal +++ b/explorer/cardano-sl-explorer.cabal @@ -1,5 +1,5 @@ name: cardano-sl-explorer -version: 1.2.0 +version: 1.2.1 synopsis: Cardano explorer description: Please see README.md license: MIT diff --git a/generator/cardano-sl-generator.cabal b/generator/cardano-sl-generator.cabal index ead0d79c648..7200cbf28bf 100644 --- a/generator/cardano-sl-generator.cabal +++ b/generator/cardano-sl-generator.cabal @@ -1,5 +1,5 @@ name: cardano-sl-generator -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - arbitrary data generation description: Cardano SL - arbitrary data generation license: MIT diff --git a/infra/cardano-sl-infra.cabal b/infra/cardano-sl-infra.cabal index 20fd1a8f330..bc3c1c2d0d0 100644 --- a/infra/cardano-sl-infra.cabal +++ b/infra/cardano-sl-infra.cabal @@ -1,5 +1,5 @@ name: cardano-sl-infra -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - infrastructural description: Cardano SL - infrastructural license: MIT diff --git a/lib/cardano-sl.cabal b/lib/cardano-sl.cabal index ef591580c98..824e2979125 100644 --- a/lib/cardano-sl.cabal +++ b/lib/cardano-sl.cabal @@ -1,5 +1,5 @@ name: cardano-sl -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL main implementation description: Please see README.md license: MIT diff --git a/lrc/cardano-sl-lrc.cabal b/lrc/cardano-sl-lrc.cabal index a99a11f6bb9..ddee2daf3f8 100644 --- a/lrc/cardano-sl-lrc.cabal +++ b/lrc/cardano-sl-lrc.cabal @@ -1,5 +1,5 @@ name: cardano-sl-lrc -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - Leaders and Richmen computation description: Cardano SL - Leaders and Richmen computation license: MIT diff --git a/networking/cardano-sl-networking.cabal b/networking/cardano-sl-networking.cabal index b57e735614f..263460deea3 100644 --- a/networking/cardano-sl-networking.cabal +++ b/networking/cardano-sl-networking.cabal @@ -1,5 +1,5 @@ name: cardano-sl-networking -version: 1.2.0 +version: 1.2.1 license: MIT license-file: LICENSE category: Network diff --git a/node/cardano-sl-node.cabal b/node/cardano-sl-node.cabal index db221d1a441..2871587773b 100644 --- a/node/cardano-sl-node.cabal +++ b/node/cardano-sl-node.cabal @@ -1,5 +1,5 @@ name: cardano-sl-node -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL simple node executable description: Please see README.md license: MIT diff --git a/pkgs/default.nix b/pkgs/default.nix index fd60301104a..4321ae715bb 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6952,7 +6952,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl"; - version = "1.2.0"; + version = "1.2.1"; src = ./../lib; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint async base bytestring @@ -7003,7 +7003,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-auxx"; - version = "1.2.0"; + version = "1.2.1"; src = ./../auxx; isLibrary = true; isExecutable = true; @@ -7046,7 +7046,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-binary"; - version = "1.2.0"; + version = "1.2.1"; src = ./../binary; libraryHaskellDepends = [ autoexporter base binary bytestring cborg containers digest @@ -7074,7 +7074,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-block"; - version = "1.2.0"; + version = "1.2.1"; src = ./../block; libraryHaskellDepends = [ aeson base bytestring cardano-sl-binary cardano-sl-core @@ -7104,7 +7104,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-client"; - version = "1.2.0"; + version = "1.2.1"; src = ./../client; libraryHaskellDepends = [ base cardano-sl cardano-sl-block cardano-sl-core cardano-sl-crypto @@ -7141,7 +7141,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-core"; - version = "1.2.0"; + version = "1.2.1"; src = ./../core; libraryHaskellDepends = [ aeson ansi-terminal autoexporter base base58-bytestring binary @@ -7170,7 +7170,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-crypto"; - version = "1.2.0"; + version = "1.2.1"; src = ./../crypto; libraryHaskellDepends = [ aeson autoexporter base binary bytestring cardano-crypto @@ -7195,7 +7195,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-db"; - version = "1.2.0"; + version = "1.2.1"; src = ./../db; libraryHaskellDepends = [ base bytestring cardano-sl-binary cardano-sl-core cardano-sl-crypto @@ -7220,7 +7220,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-delegation"; - version = "1.2.0"; + version = "1.2.1"; src = ./../delegation; libraryHaskellDepends = [ aeson base cardano-sl-binary cardano-sl-core cardano-sl-crypto @@ -7255,7 +7255,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-explorer"; - version = "1.2.0"; + version = "1.2.1"; src = ./../explorer; isLibrary = true; isExecutable = true; @@ -7308,7 +7308,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-generator"; - version = "1.2.0"; + version = "1.2.1"; src = ./../generator; libraryHaskellDepends = [ base bytestring cardano-sl cardano-sl-block cardano-sl-client @@ -7350,7 +7350,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-infra"; - version = "1.2.0"; + version = "1.2.1"; src = ./../infra; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cardano-report-server @@ -7379,7 +7379,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-lrc"; - version = "1.2.0"; + version = "1.2.1"; src = ./../lrc; libraryHaskellDepends = [ base bytestring cardano-sl-binary cardano-sl-core cardano-sl-crypto @@ -7406,7 +7406,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-networking"; - version = "1.2.0"; + version = "1.2.1"; src = ./../networking; isLibrary = true; isExecutable = true; @@ -7440,7 +7440,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-node"; - version = "1.2.0"; + version = "1.2.1"; src = ./../node; isLibrary = false; isExecutable = true; @@ -7467,7 +7467,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-ssc"; - version = "1.2.0"; + version = "1.2.1"; src = ./../ssc; libraryHaskellDepends = [ aeson array base bytestring cardano-sl-binary cardano-sl-core @@ -7507,7 +7507,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-tools"; - version = "1.2.0"; + version = "1.2.1"; src = ./../tools; isLibrary = true; isExecutable = true; @@ -7556,7 +7556,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-txp"; - version = "1.2.0"; + version = "1.2.1"; src = ./../txp; libraryHaskellDepends = [ aeson base bytestring cardano-sl-binary cardano-sl-core @@ -7588,7 +7588,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-update"; - version = "1.2.0"; + version = "1.2.1"; src = ./../update; libraryHaskellDepends = [ aeson base bytestring Cabal cardano-sl-binary cardano-sl-core @@ -7621,7 +7621,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-util"; - version = "1.2.0"; + version = "1.2.1"; src = ./../util; libraryHaskellDepends = [ aeson autoexporter base bytestring cardano-sl-networking cborg @@ -7658,7 +7658,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-wallet"; - version = "1.2.0"; + version = "1.2.1"; src = ./../wallet; libraryHaskellDepends = [ acid-state aeson async base base58-bytestring bytestring cardano-sl @@ -7711,7 +7711,7 @@ inherit (pkgs) mesa;}; }: mkDerivation { pname = "cardano-sl-wallet-new"; - version = "1.2.0"; + version = "1.2.1"; src = ./../wallet-new; isLibrary = true; isExecutable = true; diff --git a/ssc/cardano-sl-ssc.cabal b/ssc/cardano-sl-ssc.cabal index 650b70a4406..e7968217128 100644 --- a/ssc/cardano-sl-ssc.cabal +++ b/ssc/cardano-sl-ssc.cabal @@ -1,5 +1,5 @@ name: cardano-sl-ssc -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - shared seed computation description: Cardano SL - shared seed computation license: MIT diff --git a/tools/cardano-sl-tools.cabal b/tools/cardano-sl-tools.cabal index 609beed897e..376571238b3 100644 --- a/tools/cardano-sl-tools.cabal +++ b/tools/cardano-sl-tools.cabal @@ -1,5 +1,5 @@ name: cardano-sl-tools -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - Tools description: Cardano SL - Tools license: MIT diff --git a/txp/cardano-sl-txp.cabal b/txp/cardano-sl-txp.cabal index 54d70d58052..8c53b0f2828 100644 --- a/txp/cardano-sl-txp.cabal +++ b/txp/cardano-sl-txp.cabal @@ -1,5 +1,5 @@ name: cardano-sl-txp -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - transaction processing description: Cardano SL - transaction processing license: MIT diff --git a/update/cardano-sl-update.cabal b/update/cardano-sl-update.cabal index 2df58401d47..82a7198150f 100644 --- a/update/cardano-sl-update.cabal +++ b/update/cardano-sl-update.cabal @@ -1,5 +1,5 @@ name: cardano-sl-update -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - update description: Cardano SL - update license: MIT diff --git a/util/cardano-sl-util.cabal b/util/cardano-sl-util.cabal index aae5b810606..93ef22de49c 100644 --- a/util/cardano-sl-util.cabal +++ b/util/cardano-sl-util.cabal @@ -1,5 +1,5 @@ name: cardano-sl-util -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - general utilities description: This package contains utility functions not specific to Cardano SL which extend 3rd party libraries or implement diff --git a/wallet-new/cardano-sl-wallet-new.cabal b/wallet-new/cardano-sl-wallet-new.cabal index 38abf8b15d0..76f0e74a5b5 100755 --- a/wallet-new/cardano-sl-wallet-new.cabal +++ b/wallet-new/cardano-sl-wallet-new.cabal @@ -1,5 +1,5 @@ name: cardano-sl-wallet-new -version: 1.2.0 +version: 1.2.1 synopsis: The Wallet Backend for a Cardano node. description: Please see README.md homepage: https://github.com/input-output-hk/cardano-sl/#readme diff --git a/wallet/cardano-sl-wallet.cabal b/wallet/cardano-sl-wallet.cabal index 99a3628dd78..457383d5a84 100644 --- a/wallet/cardano-sl-wallet.cabal +++ b/wallet/cardano-sl-wallet.cabal @@ -1,5 +1,5 @@ name: cardano-sl-wallet -version: 1.2.0 +version: 1.2.1 synopsis: Cardano SL - wallet description: Cardano SL - wallet license: MIT From a32962830e8a99e3fbf9c29f586bc325a001af35 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 15 Jun 2018 05:17:27 +0800 Subject: [PATCH 6/6] Update ChangeLog for 1.2.1 (#3087) --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61d85387a8c..565268d5cf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # CHANGELOG +## Cardano SL 1.2.1 (Mainnet) + +Bug fix release. + +- The wallet launcher now uses a lock file. This prevents problems on + Windows if upgrading Daedalus while the old version is still + running. (DEVOPS-872) + +- Fix character encoding error in the connect script of the Docker + image. (DEVOPS-877) + + ## Cardano SL 1.2.0 (Mainnet) These are the most important code changes which were included in release 1.2.0.