From 6b6e22bb2089324b46ce0d05b7f031ceb026ab76 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 10 Nov 2018 18:17:10 -0500 Subject: [PATCH 1/8] [DEVOPS-1130] bump versions --- lib/configuration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/configuration.yaml b/lib/configuration.yaml index 6138c7627dc..80142a67314 100644 --- a/lib/configuration.yaml +++ b/lib/configuration.yaml @@ -270,10 +270,10 @@ mainnet_base: &mainnet_base update: &mainnet_base_update applicationName: cardano-sl - applicationVersion: 0 + applicationVersion: 1 lastKnownBlockVersion: bvMajor: 0 - bvMinor: 1 + bvMinor: 2 bvAlt: 0 ssc: From 1bc0dd8ad1ef5474d1a67f5ec4acd54ecb84e6e7 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Nov 2018 18:33:46 -0500 Subject: [PATCH 2/8] [DEVOPS-1137] Genesis Block Size --- lib/src/Pos/Communication/Limits.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/Pos/Communication/Limits.hs b/lib/src/Pos/Communication/Limits.hs index 8923a070bee..ce629344700 100644 --- a/lib/src/Pos/Communication/Limits.hs +++ b/lib/src/Pos/Communication/Limits.hs @@ -308,7 +308,7 @@ mlBlockHeader bvd = 1 + max (BlockHeaderGenesis <$> mlGenesisBlockHeader bvd) (BlockHeaderMain <$> mlMainBlockHeader bvd) mlGenesisBlock :: BlockVersionData -> Limit GenesisBlock -mlGenesisBlock = Limit . fromIntegral . bvdMaxBlockSize +mlGenesisBlock _ = Limit 700000 mlMainBlock :: BlockVersionData -> Limit MainBlock mlMainBlock = Limit . fromIntegral . bvdMaxBlockSize From 291b903081bb2e449d0ec94d48b23edffecb9a30 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Nov 2018 19:35:58 -0500 Subject: [PATCH 3/8] [DEVOPS-1137] Genesis Block Size Integrity --- block/src/Pos/Block/Logic/Integrity.hs | 5 ++++- lib/src/Pos/Communication/Limits.hs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/block/src/Pos/Block/Logic/Integrity.hs b/block/src/Pos/Block/Logic/Integrity.hs index aa3a3a1cc4d..7997cecc954 100644 --- a/block/src/Pos/Block/Logic/Integrity.hs +++ b/block/src/Pos/Block/Logic/Integrity.hs @@ -324,6 +324,9 @@ verifyBlocks pm curSlotId verifyNoUnknown bvd initLeaders = view _3 . foldl' ste let newLeaders = case blk of Left genesisBlock -> genesisBlock ^. genBlockLeaders Right _ -> leaders + blockMaxSize = case blk of + Left _ -> 7000 -- <- whatever value we desire + Right _ -> bvdMaxBlockSize bvd vhp = VerifyHeaderParams { vhpPrevHeader = prevHeader @@ -335,7 +338,7 @@ verifyBlocks pm curSlotId verifyNoUnknown bvd initLeaders = view _3 . foldl' ste vbp = VerifyBlockParams { vbpVerifyHeader = vhp - , vbpMaxSize = bvdMaxBlockSize bvd + , vbpMaxSize = blockMaxSize , vbpVerifyNoUnknown = verifyNoUnknown } in (newLeaders, Just $ getBlockHeader blk, res <> verifyBlock pm vbp blk) diff --git a/lib/src/Pos/Communication/Limits.hs b/lib/src/Pos/Communication/Limits.hs index ce629344700..8923a070bee 100644 --- a/lib/src/Pos/Communication/Limits.hs +++ b/lib/src/Pos/Communication/Limits.hs @@ -308,7 +308,7 @@ mlBlockHeader bvd = 1 + max (BlockHeaderGenesis <$> mlGenesisBlockHeader bvd) (BlockHeaderMain <$> mlMainBlockHeader bvd) mlGenesisBlock :: BlockVersionData -> Limit GenesisBlock -mlGenesisBlock _ = Limit 700000 +mlGenesisBlock = Limit . fromIntegral . bvdMaxBlockSize mlMainBlock :: BlockVersionData -> Limit MainBlock mlMainBlock = Limit . fromIntegral . bvdMaxBlockSize From 713909af72635a09460c455d2d9910f5bd5bc7e4 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Nov 2018 19:47:43 -0500 Subject: [PATCH 4/8] [DEVOPS-1137] Genesis Block Size Integrity Fix --- block/src/Pos/Block/Logic/Integrity.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/src/Pos/Block/Logic/Integrity.hs b/block/src/Pos/Block/Logic/Integrity.hs index 7997cecc954..f3554514aaf 100644 --- a/block/src/Pos/Block/Logic/Integrity.hs +++ b/block/src/Pos/Block/Logic/Integrity.hs @@ -324,9 +324,9 @@ verifyBlocks pm curSlotId verifyNoUnknown bvd initLeaders = view _3 . foldl' ste let newLeaders = case blk of Left genesisBlock -> genesisBlock ^. genBlockLeaders Right _ -> leaders - blockMaxSize = case blk of - Left _ -> 7000 -- <- whatever value we desire - Right _ -> bvdMaxBlockSize bvd + blockMaxSize = case blk of + Left _ -> 2000000 + Right _ -> bvdMaxBlockSize bvd vhp = VerifyHeaderParams { vhpPrevHeader = prevHeader From 262509893bb2031ff853538fb156459fc2aa058d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Nov 2018 20:57:21 -0500 Subject: [PATCH 5/8] [DEVOPS-1137] Genesis block size increase --- lib/src/Pos/Communication/Limits.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/Pos/Communication/Limits.hs b/lib/src/Pos/Communication/Limits.hs index 8923a070bee..81c208b9895 100644 --- a/lib/src/Pos/Communication/Limits.hs +++ b/lib/src/Pos/Communication/Limits.hs @@ -308,7 +308,7 @@ mlBlockHeader bvd = 1 + max (BlockHeaderGenesis <$> mlGenesisBlockHeader bvd) (BlockHeaderMain <$> mlMainBlockHeader bvd) mlGenesisBlock :: BlockVersionData -> Limit GenesisBlock -mlGenesisBlock = Limit . fromIntegral . bvdMaxBlockSize +mlGenesisBlock _ = Limit 2000000 mlMainBlock :: BlockVersionData -> Limit MainBlock mlMainBlock = Limit . fromIntegral . bvdMaxBlockSize From c5ff92a8092f8aa7fcdf84fb176d30962362d726 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Nov 2018 22:54:35 -0500 Subject: [PATCH 6/8] [DEVOPS-1137] Bump versions to 1.3.2 --- CHANGELOG.md | 6 ++ auxx/cardano-sl-auxx.cabal | 2 +- binary/cardano-sl-binary.cabal | 2 +- binary/test/cardano-sl-binary-test.cabal | 2 +- block/bench/cardano-sl-block-bench.cabal | 2 +- block/cardano-sl-block.cabal | 2 +- block/test/cardano-sl-block-test.cabal | 2 +- client/cardano-sl-client.cabal | 2 +- core/cardano-sl-core.cabal | 2 +- crypto/cardano-sl-crypto.cabal | 2 +- crypto/test/cardano-sl-crypto-test.cabal | 2 +- db/cardano-sl-db.cabal | 2 +- delegation/cardano-sl-delegation.cabal | 2 +- .../test/cardano-sl-delegation-test.cabal | 2 +- explorer/cardano-sl-explorer.cabal | 2 +- generator/cardano-sl-generator.cabal | 2 +- infra/cardano-sl-infra.cabal | 2 +- infra/test/cardano-sl-infra-test.cabal | 2 +- lib/cardano-sl.cabal | 2 +- lrc/cardano-sl-lrc.cabal | 2 +- lrc/test/cardano-sl-lrc-test.cabal | 2 +- networking/cardano-sl-networking.cabal | 2 +- node/cardano-sl-node.cabal | 2 +- pkgs/default.nix | 62 +++++++++---------- ssc/cardano-sl-ssc.cabal | 2 +- tools/cardano-sl-tools.cabal | 2 +- txp/cardano-sl-txp.cabal | 2 +- txp/test/cardano-sl-txp-test.cabal | 2 +- update/cardano-sl-update.cabal | 2 +- util/cardano-sl-util.cabal | 2 +- util/test/cardano-sl-util-test.cabal | 2 +- wallet-new/cardano-sl-wallet-new.cabal | 2 +- wallet/cardano-sl-wallet.cabal | 2 +- 33 files changed, 68 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d2f66c6e5c..b6f9759bf40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## Cardano SL 1.3.2 + +- Upgrade block version to 0.2.0 to limit max block size to 32 KB. + +- Override max block size for genesis block to have a limit of 1.953 MB. + ## Cardano SL 1.3.1 ### Features diff --git a/auxx/cardano-sl-auxx.cabal b/auxx/cardano-sl-auxx.cabal index 12ca975c1dc..9818fdfc5c1 100644 --- a/auxx/cardano-sl-auxx.cabal +++ b/auxx/cardano-sl-auxx.cabal @@ -1,5 +1,5 @@ name: cardano-sl-auxx -version: 1.3.1 +version: 1.3.2 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 fe00dea680c..a7e835a5c92 100644 --- a/binary/cardano-sl-binary.cabal +++ b/binary/cardano-sl-binary.cabal @@ -1,5 +1,5 @@ name: cardano-sl-binary -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - binary serialization description: This package defines a type class for binary serialization, helpers and instances. diff --git a/binary/test/cardano-sl-binary-test.cabal b/binary/test/cardano-sl-binary-test.cabal index 15c488bf306..37822745a53 100644 --- a/binary/test/cardano-sl-binary-test.cabal +++ b/binary/test/cardano-sl-binary-test.cabal @@ -1,5 +1,5 @@ name: cardano-sl-binary-test -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - binary serializarion (tests) description: This package contains test helpers for cardano-sl-binary. license: MIT diff --git a/block/bench/cardano-sl-block-bench.cabal b/block/bench/cardano-sl-block-bench.cabal index 3f793e2242c..fa86353ab21 100644 --- a/block/bench/cardano-sl-block-bench.cabal +++ b/block/bench/cardano-sl-block-bench.cabal @@ -1,5 +1,5 @@ name: cardano-sl-block-bench -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - block benchmark description: Cardano SL - block benchmark license: MIT diff --git a/block/cardano-sl-block.cabal b/block/cardano-sl-block.cabal index 0c17defcfd0..19557164b02 100644 --- a/block/cardano-sl-block.cabal +++ b/block/cardano-sl-block.cabal @@ -1,5 +1,5 @@ name: cardano-sl-block -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - block processing description: Cardano SL - block processing license: MIT diff --git a/block/test/cardano-sl-block-test.cabal b/block/test/cardano-sl-block-test.cabal index 48277a2d1ed..d772751ba2a 100644 --- a/block/test/cardano-sl-block-test.cabal +++ b/block/test/cardano-sl-block-test.cabal @@ -1,5 +1,5 @@ name: cardano-sl-block-test -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - block processing (tests) description: QuickCheck Arbitrary instances for Cardano SL block processing. diff --git a/client/cardano-sl-client.cabal b/client/cardano-sl-client.cabal index d7f4f0b8805..4509c6f448e 100644 --- a/client/cardano-sl-client.cabal +++ b/client/cardano-sl-client.cabal @@ -1,5 +1,5 @@ name: cardano-sl-client -version: 1.3.1 +version: 1.3.2 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 66e82f71672..18f46464fe6 100644 --- a/core/cardano-sl-core.cabal +++ b/core/cardano-sl-core.cabal @@ -1,5 +1,5 @@ name: cardano-sl-core -version: 1.3.1 +version: 1.3.2 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 ea96b01f443..78e7f2e949f 100644 --- a/crypto/cardano-sl-crypto.cabal +++ b/crypto/cardano-sl-crypto.cabal @@ -1,5 +1,5 @@ name: cardano-sl-crypto -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - cryptography primitives description: This package contains cryptography primitives used in Cardano SL. license: MIT diff --git a/crypto/test/cardano-sl-crypto-test.cabal b/crypto/test/cardano-sl-crypto-test.cabal index 6bc762a472b..a5254a4f5ed 100644 --- a/crypto/test/cardano-sl-crypto-test.cabal +++ b/crypto/test/cardano-sl-crypto-test.cabal @@ -1,5 +1,5 @@ name: cardano-sl-crypto-test -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - arbitrary instances for cardano-sl-crypto description: This package contains arbitrary instances for the cryptography primitives used in Cardano SL. license: MIT diff --git a/db/cardano-sl-db.cabal b/db/cardano-sl-db.cabal index 19ac16aa4d5..2e8ae52d083 100644 --- a/db/cardano-sl-db.cabal +++ b/db/cardano-sl-db.cabal @@ -1,5 +1,5 @@ name: cardano-sl-db -version: 1.3.1 +version: 1.3.2 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 889de13f987..f2a546eda02 100644 --- a/delegation/cardano-sl-delegation.cabal +++ b/delegation/cardano-sl-delegation.cabal @@ -1,5 +1,5 @@ name: cardano-sl-delegation -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - delegation description: Cardano SL - delegation license: MIT diff --git a/delegation/test/cardano-sl-delegation-test.cabal b/delegation/test/cardano-sl-delegation-test.cabal index 58c2b90adf3..f907c9622ad 100644 --- a/delegation/test/cardano-sl-delegation-test.cabal +++ b/delegation/test/cardano-sl-delegation-test.cabal @@ -1,5 +1,5 @@ name: cardano-sl-delegation-test -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - delegation (tests) description: Cardano SL - delegation (tests) license: MIT diff --git a/explorer/cardano-sl-explorer.cabal b/explorer/cardano-sl-explorer.cabal index f5740ae6c9d..dbec65aa775 100644 --- a/explorer/cardano-sl-explorer.cabal +++ b/explorer/cardano-sl-explorer.cabal @@ -1,5 +1,5 @@ name: cardano-sl-explorer -version: 1.3.1 +version: 1.3.2 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 f7aced5682a..199562a7b00 100644 --- a/generator/cardano-sl-generator.cabal +++ b/generator/cardano-sl-generator.cabal @@ -1,5 +1,5 @@ name: cardano-sl-generator -version: 1.3.1 +version: 1.3.2 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 33f3bc295a9..479e6e8c925 100644 --- a/infra/cardano-sl-infra.cabal +++ b/infra/cardano-sl-infra.cabal @@ -1,5 +1,5 @@ name: cardano-sl-infra -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - infrastructural description: Cardano SL - infrastructural license: MIT diff --git a/infra/test/cardano-sl-infra-test.cabal b/infra/test/cardano-sl-infra-test.cabal index acb170c02fc..33ed756f524 100644 --- a/infra/test/cardano-sl-infra-test.cabal +++ b/infra/test/cardano-sl-infra-test.cabal @@ -1,5 +1,5 @@ name: cardano-sl-infra-test -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - generators for cardano-sl-infra description: This package contains generators for the infrastructural data types used in Cardano SL. license: MIT diff --git a/lib/cardano-sl.cabal b/lib/cardano-sl.cabal index 533f91dc953..0ad119a0d05 100644 --- a/lib/cardano-sl.cabal +++ b/lib/cardano-sl.cabal @@ -1,5 +1,5 @@ name: cardano-sl -version: 1.3.1 +version: 1.3.2 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 ab787b8e43c..aab7938d0ae 100644 --- a/lrc/cardano-sl-lrc.cabal +++ b/lrc/cardano-sl-lrc.cabal @@ -1,5 +1,5 @@ name: cardano-sl-lrc -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - Leaders and Richmen computation description: Cardano SL - Leaders and Richmen computation license: MIT diff --git a/lrc/test/cardano-sl-lrc-test.cabal b/lrc/test/cardano-sl-lrc-test.cabal index 3c21762d931..71de1f3885c 100644 --- a/lrc/test/cardano-sl-lrc-test.cabal +++ b/lrc/test/cardano-sl-lrc-test.cabal @@ -1,5 +1,5 @@ name: cardano-sl-lrc-test -version: 1.3.1 +version: 1.3.2 synopsis: Testing modules for the Cardano SL lrc package description: Testing modules for the Cardano SL lrc package license: MIT diff --git a/networking/cardano-sl-networking.cabal b/networking/cardano-sl-networking.cabal index 840e2f97d5a..f6257f573b6 100644 --- a/networking/cardano-sl-networking.cabal +++ b/networking/cardano-sl-networking.cabal @@ -1,5 +1,5 @@ name: cardano-sl-networking -version: 1.3.1 +version: 1.3.2 license: MIT license-file: LICENSE category: Network diff --git a/node/cardano-sl-node.cabal b/node/cardano-sl-node.cabal index fd19cb90d4a..f46076e6cbf 100644 --- a/node/cardano-sl-node.cabal +++ b/node/cardano-sl-node.cabal @@ -1,5 +1,5 @@ name: cardano-sl-node -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL simple node executable description: Please see README.md license: MIT diff --git a/pkgs/default.nix b/pkgs/default.nix index 6bb95f6d263..49f1a749c95 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14715,7 +14715,7 @@ license = stdenv.lib.licenses.bsd3; mkDerivation { pname = "cardano-sl"; -version = "1.3.1"; +version = "1.3.2"; src = ./../lib; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -14979,7 +14979,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-auxx"; -version = "1.3.1"; +version = "1.3.2"; src = ./../auxx; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15133,7 +15133,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-binary"; -version = "1.3.1"; +version = "1.3.2"; src = ./../binary; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15246,7 +15246,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-binary-test"; -version = "1.3.1"; +version = "1.3.2"; src = ./../binary/test; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15340,7 +15340,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-block"; -version = "1.3.1"; +version = "1.3.2"; src = ./../block; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15418,7 +15418,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-block-bench"; -version = "1.3.1"; +version = "1.3.2"; src = ./../block/bench; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15481,7 +15481,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-block-test"; -version = "1.3.1"; +version = "1.3.2"; src = ./../block/test; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15564,7 +15564,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-client"; -version = "1.3.1"; +version = "1.3.2"; src = ./../client; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15694,7 +15694,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-core"; -version = "1.3.1"; +version = "1.3.2"; src = ./../core; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15908,7 +15908,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-crypto"; -version = "1.3.1"; +version = "1.3.2"; src = ./../crypto; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -15993,7 +15993,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-crypto-test"; -version = "1.3.1"; +version = "1.3.2"; src = ./../crypto/test; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -16053,7 +16053,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-db"; -version = "1.3.1"; +version = "1.3.2"; src = ./../db; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -16135,7 +16135,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-delegation"; -version = "1.3.1"; +version = "1.3.2"; src = ./../delegation; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -16205,7 +16205,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-delegation-test"; -version = "1.3.1"; +version = "1.3.2"; src = ./../delegation/test; libraryHaskellDepends = [ base @@ -16307,7 +16307,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-explorer"; -version = "1.3.1"; +version = "1.3.2"; src = ./../explorer; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -16673,7 +16673,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-generator"; -version = "1.3.1"; +version = "1.3.2"; src = ./../generator; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -16829,7 +16829,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-infra"; -version = "1.3.1"; +version = "1.3.2"; src = ./../infra; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -16929,7 +16929,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-infra-test"; -version = "1.3.1"; +version = "1.3.2"; src = ./../infra/test; libraryHaskellDepends = [ base @@ -16984,7 +16984,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-lrc"; -version = "1.3.1"; +version = "1.3.2"; src = ./../lrc; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17050,7 +17050,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-lrc-test"; -version = "1.3.1"; +version = "1.3.2"; src = ./../lrc/test; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17127,7 +17127,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-networking"; -version = "1.3.1"; +version = "1.3.2"; src = ./../networking; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17241,7 +17241,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-node"; -version = "1.3.1"; +version = "1.3.2"; src = ./../node; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17320,7 +17320,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-ssc"; -version = "1.3.1"; +version = "1.3.2"; src = ./../ssc; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17457,7 +17457,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-tools"; -version = "1.3.1"; +version = "1.3.2"; src = ./../tools; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17618,7 +17618,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-txp"; -version = "1.3.1"; +version = "1.3.2"; src = ./../txp; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17725,7 +17725,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-txp-test"; -version = "1.3.1"; +version = "1.3.2"; src = ./../txp/test; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17807,7 +17807,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-update"; -version = "1.3.1"; +version = "1.3.2"; src = ./../update; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -17926,7 +17926,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-util"; -version = "1.3.1"; +version = "1.3.2"; src = ./../util; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -18039,7 +18039,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-util-test"; -version = "1.3.1"; +version = "1.3.2"; src = ./../util/test; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -18165,7 +18165,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-wallet"; -version = "1.3.1"; +version = "1.3.2"; src = ./../wallet; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" @@ -18398,7 +18398,7 @@ license = stdenv.lib.licenses.mit; mkDerivation { pname = "cardano-sl-wallet-new"; -version = "1.3.1"; +version = "1.3.2"; src = ./../wallet-new; configureFlags = [ "--ghc-option=-fwarn-redundant-constraints" diff --git a/ssc/cardano-sl-ssc.cabal b/ssc/cardano-sl-ssc.cabal index 0827184fcef..437cb63312d 100644 --- a/ssc/cardano-sl-ssc.cabal +++ b/ssc/cardano-sl-ssc.cabal @@ -1,5 +1,5 @@ name: cardano-sl-ssc -version: 1.3.1 +version: 1.3.2 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 3b57ebbd4fe..05258241bda 100644 --- a/tools/cardano-sl-tools.cabal +++ b/tools/cardano-sl-tools.cabal @@ -1,5 +1,5 @@ name: cardano-sl-tools -version: 1.3.1 +version: 1.3.2 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 a991466a2b3..77bd6d55bb6 100644 --- a/txp/cardano-sl-txp.cabal +++ b/txp/cardano-sl-txp.cabal @@ -1,5 +1,5 @@ name: cardano-sl-txp -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - transaction processing description: Cardano SL - transaction processing license: MIT diff --git a/txp/test/cardano-sl-txp-test.cabal b/txp/test/cardano-sl-txp-test.cabal index c47daa16d8d..66bc5952cc7 100644 --- a/txp/test/cardano-sl-txp-test.cabal +++ b/txp/test/cardano-sl-txp-test.cabal @@ -1,5 +1,5 @@ name: cardano-sl-txp-test -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - arbitrary instances for cardano-sl-txp description: Cardano SL - arbitrary instances for cardano-sl-txp license: MIT diff --git a/update/cardano-sl-update.cabal b/update/cardano-sl-update.cabal index 804a5f42926..55ff42a0447 100644 --- a/update/cardano-sl-update.cabal +++ b/update/cardano-sl-update.cabal @@ -1,5 +1,5 @@ name: cardano-sl-update -version: 1.3.1 +version: 1.3.2 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 04b324b44af..2969844b3a9 100644 --- a/util/cardano-sl-util.cabal +++ b/util/cardano-sl-util.cabal @@ -1,5 +1,5 @@ name: cardano-sl-util -version: 1.3.1 +version: 1.3.2 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/util/test/cardano-sl-util-test.cabal b/util/test/cardano-sl-util-test.cabal index f88f59e3c2c..4a2e9bf2ac1 100644 --- a/util/test/cardano-sl-util-test.cabal +++ b/util/test/cardano-sl-util-test.cabal @@ -1,5 +1,5 @@ name: cardano-sl-util-test -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - general utilities (tests) description: QuickCheck Arbitrary instances for the Cardano SL general utilities package. diff --git a/wallet-new/cardano-sl-wallet-new.cabal b/wallet-new/cardano-sl-wallet-new.cabal index bf3f96a50be..a8528ef12aa 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.3.1 +version: 1.3.2 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 48833e09c82..b2982bdb64d 100644 --- a/wallet/cardano-sl-wallet.cabal +++ b/wallet/cardano-sl-wallet.cabal @@ -1,5 +1,5 @@ name: cardano-sl-wallet -version: 1.3.1 +version: 1.3.2 synopsis: Cardano SL - wallet description: Cardano SL - wallet license: MIT From 7e8e439d13e46fce189137eb1011eb0ce26a494d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Nov 2018 22:25:27 -0500 Subject: [PATCH 7/8] [DEVOPS-1137] buildkite windows build --- .buildkite/pipeline.yml | 5 ++ .buildkite/windows.ps1 | 92 +++++++++++++++++++++ appveyor.yml | 171 ---------------------------------------- 3 files changed, 97 insertions(+), 171 deletions(-) create mode 100644 .buildkite/windows.ps1 delete mode 100644 appveyor.yml diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index b128c39aa81..a3a8feab38a 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -4,6 +4,11 @@ steps: agents: system: x86_64-linux + - label: 'Windows' + command: 'PowerShell.exe -executionpolicy remotesigned -File .\.buildkite\windows.ps1' + agents: + system: x86_64-win2016 + - label: 'stack2nix' command: 'scripts/ci/nix-shell.sh -p cabal2nix stack cabal-install ghc moreutils expect -Q -j 4 --run scripts/check-stack2nix.sh' agents: diff --git a/.buildkite/windows.ps1 b/.buildkite/windows.ps1 new file mode 100644 index 00000000000..9da7c11d84c --- /dev/null +++ b/.buildkite/windows.ps1 @@ -0,0 +1,92 @@ +Set-PSDebug -Trace 1 + +# Avoid long paths on Windows +$env:STACK_ROOT="D:\s" +$env:STACK_WORK=".w" +$env:WORK_DIR="D:\w" +# Override the temp directory to avoid sed escaping issues +# See https://github.com/haskell/cabal/issues/5386 +$env:TMP="D:\\tmp" + +# Store the original checkout directory +$env:CHECKOUT_PATH=(Get-Item -Path ".\").FullName + +# Temp directory needs to exist +New-Item -ItemType Directory -Force -Path $env:TMP + +# Setup stuff (commented out) +#mkdir d:\ghc +# +#Invoke-WebRequest "https://s3.eu-central-1.amazonaws.com/ci-static/ghc-8.2.2-x86_64-unknown-mingw32.tar.xz" -OutFile "D:\ghc\ghc.tar.xz" -UserAgent "Curl" +# +#7z x D:\ghc\ghc.tar.xz -oD:\ghc +# +#7z x D:\ghc\ghc.tar -oD:\ghc + +# OpenSSL +# +#$env:USERPROFILE +#(New-Object Net.WebClient).DownloadFile('https://slproweb.com/download/Win64OpenSSL-1_0_2p.exe', "D:\Downloads\Win64OpenSSL.exe") +#cmd /c start /wait "D:\Downloads\Win64OpenSSL.exe" /silent /verysilent /sp- /suppressmsgboxes /DIR=D:\OpenSSL-Win64-v102 +## Install stack +#Start-FileDownload http://www.stackage.org/stack/windows-x86_64 -FileName D:\Downloads\stack.zip +#curl.exe http://www.stackage.org/stack/windows-x86_64 -o d:\Downloads\stack.zip -L +#7z -oD:\stack x D:\Downloads\stack.zip + +$env:PATH="$env:PATH;D:\ghc\ghc-8.4.4\bin;D:\stack;$Env:Programfiles\7-Zip;D:\w" + +# Install liblzma/xz +#curl -L https://tukaani.org/xz/xz-5.2.3-windows.zip -o xz-5.2.3-windows.zip +#7z -oD:\xz_extracted x xz-5.2.3-windows.zip + +rd -r -fo $env:WORK_DIR +mkdir $env:WORK_DIR +copy-item $env:CHECKOUT_PATH\* $env:WORK_DIR -force -recurse +cd $env:WORK_DIR + +git.exe clone https://github.com/facebook/rocksdb.git --branch v4.13.5 +# curl.exe -L 'https://s3.eu-central-1.amazonaws.com/ci-static/serokell-rocksdb-haskell-325427fc709183c8fdf777ad5ea09f8d92bf8585.zip' -o D:\Downloads\rocksdb.zip +7z x D:\Downloads\rocksdb.zip + +# CSL-1509: After moving the 'cardano-sl' project itself into a separate folder ('lib/'), the 'cardano-text.exe' executable fails on AppVeyor CI. +# After some investigation, it was discovered that this was because 'rocksdb.dll' has to be located in this folder as well, or else the test executable doesn't work. +copy rocksdb.dll node +copy rocksdb.dll lib +copy rocksdb.dll wallet-new + +# Start doing stuff + +stack.exe config --system-ghc set system-ghc --global true +# stack.exe config --system-ghc set programs c:\s\programs --global true +stack.exe path +stack.exe exec -- ghc-pkg recache +stack.exe --verbosity warn setup --no-reinstall +# Install happy separately: https://github.com/commercialhaskell/stack/issues/3151#issuecomment-310642487. Also install cpphs because it's a build-tool and Stack can't figure out by itself that it should be installed +stack.exe --verbosity warn install happy cpphs -j 2 --no-terminal --local-bin-path $env:SYSTEMROOT\system32 --extra-include-dirs="D:\OpenSSL-Win64-v102\include" --extra-lib-dirs="D:\OpenSSL-Win64-v102" --extra-include-dirs="D:\xz_extracted\include" --extra-lib-dirs="D:\xz_extracted\bin_x86-64" --extra-include-dirs="$env:WORK_DIR\rocksdb\include" --extra-lib-dirs="$env:WORK_DIR" +# TODO: CSL-1133. To be reenabled. +# stack.exe test --coverage +# stack.exe hpc report cardano-sl cardano-sl-txp cardano-sl-core cardano-sl-db cardano-sl-update cardano-sl-infra cardano-sl-lrc cardano-sl-ssc + +#We intentionally don't build auxx here, because this build is for installer. +stack.exe --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet-new -j 3 --no-terminal --local-bin-path $env:WORK_DIR --no-haddock-deps --flag cardano-sl-core:-asserts --flag cardano-sl-tools:for-installer --extra-include-dirs="D:\OpenSSL-Win64-v102\include" --extra-lib-dirs="D:\OpenSSL-Win64-v102" --extra-include-dirs="D:\xz_extracted\include" --extra-lib-dirs="D:\xz_extracted\bin_x86-64" --extra-include-dirs="$env:WORK_DIR\rocksdb\include" --extra-lib-dirs="$env:WORK_DIR" --ghc-options="-copy-libs-when-linking" + +# from here onwards, errors terminate the script +$ErrorActionPreference = "Stop" + +#Cardano pieces, modulo the frontend +mkdir daedalus +## log config is called `log-config-prod.yaml` just in case, it's the old name +copy log-configs\daedalus.yaml daedalus\log-config-prod.yaml +copy lib\configuration.yaml daedalus\ +copy lib\*genesis*.json daedalus\ +copy cardano-launcher.exe daedalus\ +copy cardano-node.exe daedalus\ +copy cardano-x509-certificates.exe daedalus\ +cd daedalus +$env:BUILDKITE_BUILD_NUMBER | Out-File build-id +$env:BUILDKITE_COMMIT | Out-File commit-id +cd .. + +$daedaluszip = "$env:BUILDKITE_COMMIT.zip" +7z.exe a $daedaluszip .\daedalus\* +buildkite-agent artifact upload $daedaluszip diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index b1d78e1add3..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,171 +0,0 @@ -version: 1.0.{build} -image: Visual Studio 2015 - -build: off - -environment: - global: - # Avoid long paths on Windows - STACK_ROOT: "c:\\s" - STACK_WORK: ".w" - WORK_DIR: "c:\\w" - CACHE_S3_VERSION: v0.1.4 - CACHE_S3_MAX_SIZE: 1600MB # AppVeyor limits the amount uploaded to approx 2GB - AWS_REGION: us-west-1 - S3_BUCKET: appveyor-ci-cache - AWS_ACCESS_KEY_ID: - secure: sQWt5CpaN0H+jwUVoTsrET46pADUDEcrJ5D9MHmKX0M= - AWS_SECRET_ACCESS_KEY: - secure: m5sQYd16K8HA0zoZaD0gOl4EEWUso1D51L5rp+kT3hLaIE3tt4iT+b+iW8F4F0FU - -init: -- ps: $env:CACHE_S3_READY = (("$env:CACHE_S3_VERSION" -ne "") -and ("$env:S3_BUCKET" -ne "") -and ("$env:AWS_ACCESS_KEY_ID" -ne "") -and ("$env:AWS_SECRET_ACCESS_KEY" -ne "")) - -before_test: -# Avoid long paths not to each MAX_PATH of 260 chars -- xcopy /q /s /e /r /k /i /v /h /y "%APPVEYOR_BUILD_FOLDER%" "%WORK_DIR%" -- cd "%WORK_DIR%" -# Restore cache -- Echo %APPVEYOR_BUILD_VERSION% > build-id -- ps: >- - Write-Host "in pagefile script" ; - $c = Get-WmiObject Win32_computersystem -EnableAllPrivileges ; - if($c.AutomaticManagedPagefile){ - Write-Host "disabling managed page file settings" - $c.AutomaticManagedPagefile = $false - $c.Put() | Out-Null - } ; - $new_page_size=25000 ; - $CurrentPageFile = Get-WmiObject -Class Win32_PageFileSetting ; - if ($CurrentPageFile.InitialSize -ne $new_page_size) { - Write-Host "setting new page file size to $new_page_size" - $CurrentPageFile.InitialSize=$new_page_size - $CurrentPageFile.MaximumSize=$new_page_size - $CurrentPageFile.Put() | Out-Null - } ; - if ( $env:CACHE_S3_READY -eq $true ) { - Start-FileDownload https://github.com/fpco/cache-s3/releases/download/$env:CACHE_S3_VERSION/cache-s3-$env:CACHE_S3_VERSION-windows-x86_64.zip -FileName cache-s3.zip - 7z x cache-s3.zip cache-s3.exe - .\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -v info -c restore stack --base-branch=develop - .\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -v info -c restore stack work --base-branch=develop - } - -# Get custom GHC -- ps: >- - mkdir C:\ghc - - Invoke-WebRequest "https://s3.eu-central-1.amazonaws.com/ci-static/ghc-8.2.2-x86_64-unknown-mingw32.tar.xz" -OutFile "C:\ghc\ghc.tar.xz" -UserAgent "Curl" - - 7z x C:\ghc\ghc.tar.xz -oC:\ghc - - 7z x C:\ghc\ghc.tar -oC:\ghc - - $env:PATH="$env:PATH;C:\ghc\ghc-8.2.2\bin" - -# Install OpenSSL 1.0.2 (see https://github.com/appveyor/ci/issues/1665) -- ps: (New-Object Net.WebClient).DownloadFile('https://slproweb.com/download/Win64OpenSSL-1_0_2p.exe', "$($env:USERPROFILE)\Win64OpenSSL.exe") -- ps: cmd /c start /wait "$($env:USERPROFILE)\Win64OpenSSL.exe" /silent /verysilent /sp- /suppressmsgboxes /DIR=C:\OpenSSL-Win64-v102 -- ps: Install-Product node 6 -# Install stack -- ps: Start-FileDownload http://www.stackage.org/stack/windows-x86_64 -FileName stack.zip -- 7z x stack.zip stack.exe - - -# Install rocksdb -- git clone https://github.com/facebook/rocksdb.git --branch v4.13.5 -- ps: Start-FileDownload 'https://s3.eu-central-1.amazonaws.com/ci-static/serokell-rocksdb-haskell-325427fc709183c8fdf777ad5ea09f8d92bf8585.zip' -FileName rocksdb.zip -- 7z x rocksdb.zip - -# CSL-1509: After moving the 'cardano-sl' project itself into a separate folder ('lib/'), the 'cardano-text.exe' executable fails on AppVeyor CI. -# After some investigation, it was discovered that this was because 'rocksdb.dll' has to be located in this folder as well, or else the test executable doesn't work. -- copy rocksdb.dll node -- copy rocksdb.dll lib -- copy rocksdb.dll wallet -- copy rocksdb.dll wallet-new - -# Install liblzma/xz -- ps: Start-FileDownload https://tukaani.org/xz/xz-5.2.3-windows.zip -Filename xz-5.2.3-windows.zip -- 7z -oC:\xz_extracted x xz-5.2.3-windows.zip - -test_script: - - cd "%WORK_DIR%" - - stack config --system-ghc set system-ghc --global true - - stack exec -- ghc-pkg recache - - stack --verbosity warn setup --no-reinstall > nul - # Install happy separately: https://github.com/commercialhaskell/stack/issues/3151#issuecomment-310642487. Also install cpphs because it's a build-tool and Stack can't figure out by itself that it should be installed - - scripts\ci\appveyor-retry call stack --verbosity warn install happy cpphs - -j 2 - --no-terminal - --local-bin-path %SYSTEMROOT%\system32 - --extra-include-dirs="C:\OpenSSL-Win64-v102\include" - --extra-lib-dirs="C:\OpenSSL-Win64-v102" - --extra-include-dirs="C:\xz_extracted\include" - --extra-lib-dirs="C:\xz_extracted\bin_x86-64" - --extra-include-dirs="%WORK_DIR%\rocksdb\include" - --extra-lib-dirs="%WORK_DIR%" -# TODO: CSL-1133. To be reenabled. -# - stack test --coverage -# - stack hpc report cardano-sl cardano-sl-txp cardano-sl-core cardano-sl-db cardano-sl-update cardano-sl-infra cardano-sl-lrc cardano-sl-ssc -# Retry transient failures due to https://github.com/haskell/cabal/issues/4005 - # We intentionally don't build auxx here, because this build is for installer. - - scripts\ci\appveyor-retry call stack --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet cardano-sl-wallet-new - -j 3 - --no-terminal - --local-bin-path %WORK_DIR% - --no-haddock-deps - --flag cardano-sl-core:-asserts - --flag cardano-sl-tools:for-installer - --flag cardano-sl-wallet:for-installer - --extra-include-dirs="C:\OpenSSL-Win64-v102\include" - --extra-lib-dirs="C:\OpenSSL-Win64-v102" - --extra-include-dirs="C:\xz_extracted\include" - --extra-lib-dirs="C:\xz_extracted\bin_x86-64" - --extra-include-dirs="%WORK_DIR%\rocksdb\include" - --extra-lib-dirs="%WORK_DIR%" - # Cardano pieces, modulo the frontend - - mkdir daedalus - # log config is called `log-config-prod.yaml` just in case, it's the old name - - copy log-configs\daedalus.yaml daedalus\log-config-prod.yaml - - copy lib\configuration.yaml daedalus\ - - copy lib\*genesis*.json daedalus\ - - copy cardano-launcher.exe daedalus\ - - copy cardano-node.exe daedalus\ - - copy cardano-x509-certificates.exe daedalus\ - - cd daedalus - - Echo %APPVEYOR_BUILD_VERSION% > build-id - - Echo %APPVEYOR_REPO_COMMIT% > commit-id - - Echo https://ci.appveyor.com/project/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%/build/%APPVEYOR_BUILD_VERSION% > ci-url - -after_test: - - xcopy /q /s /e /r /k /i /v /h /y "%WORK_DIR%\daedalus" "%APPVEYOR_BUILD_FOLDER%\daedalus" - - cd "%WORK_DIR%/daedalus" - - 7z a "%APPVEYOR_REPO_COMMIT%.zip" * - - appveyor PushArtifact "%APPVEYOR_REPO_COMMIT%.zip" - - cd "%WORK_DIR%" # Get back to where cache-s3.exe is located - - ps: >- - if ( ($env:CACHE_S3_READY -eq $true) -and (-not $env:APPVEYOR_PULL_REQUEST_NUMBER) ) { - if ($env:APPVEYOR_REPO_BRANCH -eq "master" -Or $env:APPVEYOR_REPO_BRANCH -eq "develop" -Or $env:APPVEYOR_REPO_BRANCH -like "release*") { - Write-Host "saving stack" - .\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -c -v info save stack - Write-Host "done stack" - } - Write-Host "saving stack work" - .\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -c -v info save stack work - Write-Host "done stack work" - } -artifacts: - - path: daedalus/ - name: CardanoSL - type: zip - -deploy: - provider: S3 - access_key_id: - secure: IEky6PsMzHaKHNBMxR8tQaQI8X7qWRB9+HuEroTVRBk= - secret_access_key: - secure: cqjzG96hWB1x3JDbVSbF9E+aJ5jKvIGacJRUDWATHaTOYfSt6Rvive/NrF4lKBIm - bucket: appveyor-ci-deploy - region: ap-northeast-1 - set_public: true - folder: cardano-sl - artifact: $(APPVEYOR_REPO_COMMIT).zip From d73464ceb6f9bb9f79d4f329bfeb940e52df215c Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Nov 2018 23:23:32 -0500 Subject: [PATCH 8/8] [DEVOPS-1137] fix windows buildkite CI --- .buildkite/windows.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/windows.ps1 b/.buildkite/windows.ps1 index 9da7c11d84c..c84e022d075 100644 --- a/.buildkite/windows.ps1 +++ b/.buildkite/windows.ps1 @@ -33,7 +33,7 @@ New-Item -ItemType Directory -Force -Path $env:TMP #curl.exe http://www.stackage.org/stack/windows-x86_64 -o d:\Downloads\stack.zip -L #7z -oD:\stack x D:\Downloads\stack.zip -$env:PATH="$env:PATH;D:\ghc\ghc-8.4.4\bin;D:\stack;$Env:Programfiles\7-Zip;D:\w" +$env:PATH="$env:PATH;D:\ghc\ghc-8.2.2\bin;D:\stack;$Env:Programfiles\7-Zip;D:\w" # Install liblzma/xz #curl -L https://tukaani.org/xz/xz-5.2.3-windows.zip -o xz-5.2.3-windows.zip @@ -68,7 +68,7 @@ stack.exe --verbosity warn install happy cpphs -j 2 --no-terminal --local-bin-pa # stack.exe hpc report cardano-sl cardano-sl-txp cardano-sl-core cardano-sl-db cardano-sl-update cardano-sl-infra cardano-sl-lrc cardano-sl-ssc #We intentionally don't build auxx here, because this build is for installer. -stack.exe --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet-new -j 3 --no-terminal --local-bin-path $env:WORK_DIR --no-haddock-deps --flag cardano-sl-core:-asserts --flag cardano-sl-tools:for-installer --extra-include-dirs="D:\OpenSSL-Win64-v102\include" --extra-lib-dirs="D:\OpenSSL-Win64-v102" --extra-include-dirs="D:\xz_extracted\include" --extra-lib-dirs="D:\xz_extracted\bin_x86-64" --extra-include-dirs="$env:WORK_DIR\rocksdb\include" --extra-lib-dirs="$env:WORK_DIR" --ghc-options="-copy-libs-when-linking" +stack.exe --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet-new -j 3 --no-terminal --local-bin-path $env:WORK_DIR --no-haddock-deps --flag cardano-sl-core:-asserts --flag cardano-sl-tools:for-installer --extra-include-dirs="D:\OpenSSL-Win64-v102\include" --extra-lib-dirs="D:\OpenSSL-Win64-v102" --extra-include-dirs="D:\xz_extracted\include" --extra-lib-dirs="D:\xz_extracted\bin_x86-64" --extra-include-dirs="$env:WORK_DIR\rocksdb\include" --extra-lib-dirs="$env:WORK_DIR" # from here onwards, errors terminate the script $ErrorActionPreference = "Stop"