From 220d335823d3b8ee7f3c8b6d969951cd5a73cf8c Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Tue, 14 Aug 2018 14:38:17 +0300 Subject: [PATCH 1/4] report-server: bump to latest master --- pkgs/default.nix | 6 +++--- stack.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index f2cdee5761d..c389f1987fd 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14539,12 +14539,12 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-report-server"; -version = "0.4.10"; +version = "0.5.10"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-report-server.git"; -sha256 = "0chhbnrl68aqjfhkqvq53v572zsg52mj8pjxl3n7nnbc006cqs49"; -rev = "81eea7361a75923f9402fcb7840fb36722dbf88e"; +sha256 = "1gk0wbwl0pkq8xjq6znvc699zpv3xgzgxncsb4wncpjimjlf7dk5"; +rev = "43622ed083887c60609e030cef6eadcd3dbd7b67"; }; isLibrary = true; diff --git a/stack.yaml b/stack.yaml index d8a80aaeda8..20461edb293 100644 --- a/stack.yaml +++ b/stack.yaml @@ -73,7 +73,7 @@ packages: extra-dep: true - location: git: https://github.com/input-output-hk/cardano-report-server.git - commit: 81eea7361a75923f9402fcb7840fb36722dbf88e # master 0.4.10 + commit: 43622ed083887c60609e030cef6eadcd3dbd7b67 extra-dep: true # These three are needed for cardano-sl-networking - location: From ca4e079525d744ab356177f5b06f9f10658df3a6 Mon Sep 17 00:00:00 2001 From: ksaric Date: Tue, 14 Aug 2018 14:54:44 +0200 Subject: [PATCH 2/4] [TSD-116] Changes required on the cardano-sl side. --- infra/Pos/Infra/Reporting/Http.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/infra/Pos/Infra/Reporting/Http.hs b/infra/Pos/Infra/Reporting/Http.hs index 76b0a84c1c6..d5e6328458e 100644 --- a/infra/Pos/Infra/Reporting/Http.hs +++ b/infra/Pos/Infra/Reporting/Http.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE AllowAmbiguousTypes #-} - module Pos.Infra.Reporting.Http ( sendReport , sendReportNodeImpl @@ -13,11 +11,13 @@ import Control.Exception.Safe (catchAny, try) import Data.Aeson (encode) import qualified Data.List.NonEmpty as NE import Data.Time.Clock (getCurrentTime) +import Data.Version (showVersion) import Formatting (sformat, shown, string, (%)) import Network.HTTP.Client (httpLbs, newManager, parseUrlThrow) import qualified Network.HTTP.Client.MultipartFormData as Form import Network.HTTP.Client.TLS (tlsManagerSettings) -import Pos.ReportServer.Report (ReportInfo (..), ReportType (..)) +import Pos.ReportServer.Report (BackendVersion (..), ReportInfo (..), ReportType (..), + Version (..)) import System.FilePath (takeFileName) import System.Info (arch, os) @@ -26,7 +26,7 @@ import Pos.Crypto (ProtocolMagic (..)) import Pos.Infra.Reporting.Exceptions (ReportingError (..)) import Pos.Infra.Reporting.MemState () import Pos.Util.CompileInfo (CompileTimeInfo) -import Pos.Util.Trace (Trace, Severity (..), traceWith) +import Pos.Util.Trace (Severity (..), Trace, traceWith) import Pos.Util.Util (()) @@ -69,7 +69,7 @@ sendReport pm compileInfo mLogFile reportType appName reportServerUri = do -- We are using version of 'cardano-sl-infra' here. We agreed -- that the version of 'cardano-sl' and it subpackages should -- be same. - , rVersion = version + , rVersion = BackendVersion . Version . fromString . showVersion $ version , rBuild = pretty compileInfo , rOS = toText (os <> "-" <> arch) , rMagic = getProtocolMagic pm From 4f875c920c8b84c34458f435c8e184f306c2dcf3 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Fri, 17 Aug 2018 13:14:58 -0300 Subject: [PATCH 3/4] bump to master as-of 2018-08-16 --- pkgs/default.nix | 4 ++-- stack.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index c389f1987fd..f08980db82b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14543,8 +14543,8 @@ version = "0.5.10"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-report-server.git"; -sha256 = "1gk0wbwl0pkq8xjq6znvc699zpv3xgzgxncsb4wncpjimjlf7dk5"; -rev = "43622ed083887c60609e030cef6eadcd3dbd7b67"; +sha256 = "0hmhdr7mxhkr4mmadrayic0iz5rh5jznirnijnz1wwilw2ah4asi"; +rev = "96b69eaecb203b5c3dcc49359346fca682de791f"; }; isLibrary = true; diff --git a/stack.yaml b/stack.yaml index 20461edb293..e2720b9da41 100644 --- a/stack.yaml +++ b/stack.yaml @@ -73,7 +73,7 @@ packages: extra-dep: true - location: git: https://github.com/input-output-hk/cardano-report-server.git - commit: 43622ed083887c60609e030cef6eadcd3dbd7b67 + commit: 96b69eaecb203b5c3dcc49359346fca682de791f extra-dep: true # These three are needed for cardano-sl-networking - location: From 74402ed249f749f0c45f0399f2dd155605865a5d Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Fri, 17 Aug 2018 14:07:42 -0300 Subject: [PATCH 4/4] bump report server again, to fix reply headers --- pkgs/default.nix | 4 ++-- stack.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index f08980db82b..7c934d7face 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14543,8 +14543,8 @@ version = "0.5.10"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-report-server.git"; -sha256 = "0hmhdr7mxhkr4mmadrayic0iz5rh5jznirnijnz1wwilw2ah4asi"; -rev = "96b69eaecb203b5c3dcc49359346fca682de791f"; +sha256 = "02n86wbfr3z2xqrc8g8naj0dc5j4644y0l295qzdqlfynmz6a82z"; +rev = "9b96874d0f234554a5779d98762cc0a6773a532a"; }; isLibrary = true; diff --git a/stack.yaml b/stack.yaml index e2720b9da41..b3a1873a633 100644 --- a/stack.yaml +++ b/stack.yaml @@ -73,7 +73,7 @@ packages: extra-dep: true - location: git: https://github.com/input-output-hk/cardano-report-server.git - commit: 96b69eaecb203b5c3dcc49359346fca682de791f + commit: 9b96874d0f234554a5779d98762cc0a6773a532a extra-dep: true # These three are needed for cardano-sl-networking - location: