Merge master into rvl/2578/scrypt-flag

# Conflicts: # lib/core-integration/cardano-wallet-core-integration.cabal # lib/core/src/Cardano/Wallet.hs # lib/core/src/Cardano/Wallet/Api/Types.hs # lib/core/src/Cardano/Wallet/Primitive/AddressDerivation/Byron.hs # lib/core/src/Cardano/Wallet/Primitive/AddressDerivation/Icarus.hs # lib/core/src/Cardano/Wallet/Primitive/AddressDerivation/Shelley.hs # lib/core/src/Cardano/Wallet/Primitive/AddressDiscovery/Sequential.hs # lib/core/src/Cardano/Wallet/Transaction.hs # lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs # lib/core/test/unit/Cardano/Wallet/DB/StateMachine.hs # lib/shelley/src/Cardano/Wallet/Shelley/Transaction.hs # lib/shelley/test/unit/Cardano/Wallet/Shelley/TransactionSpec.hs # nix/.stack.nix/cardano-wallet-core-integration.nix # nix/.stack.nix/cardano-wallet-core.nix
cardano-foundation · Oct 18, 2021 · 7d6d211 · 7d6d211
2 parents 24da1b0 + 54326ed
commit 7d6d211
Show file tree

Hide file tree

Showing 343 changed files with 35,813 additions and 12,697 deletions.
diff --git a/.buildkite/bench-restore.sh b/.buildkite/bench-restore.sh
@@ -39,7 +39,9 @@ echo "+++ Results - $network"
 cat $results
 
 mv restore.hp $artifact_name.hp
-hp2pretty $artifact_name.hp
+
+# FIXME [ADP-1074]
+# hp2pretty $artifact_name.hp
 
 GNUPLOT_PROGRAM=$(cat <<EOP
 set timefmt "%s";
@@ -86,7 +88,8 @@ if [ -n "${BUILDKITE:-}" ]; then
   buildkite-agent artifact upload plot.svg
 
   echo "+++ Heap profile"
-  printf '\033]1338;url='"artifact://$artifact_name.svg"';alt='"Heap profile"'\a\n'
+  echo "Heap profile visualization has temporarily been disabled because it runs out of memory (ADP-1074)"
+  # printf '\033]1338;url='"artifact://$artifact_name.svg"';alt='"Heap profile"'\a\n'
   echo "+++ Restore plot"
   printf '\033]1338;url='"artifact://plot.svg"';alt='"Restore plot"'\a\n'
 fi

diff --git a/.buildkite/check-stylish.sh b/.buildkite/check-stylish.sh
@@ -2,6 +2,8 @@
 
 set -euo pipefail
 
+echo "+++ stylish-haskell"
+
 stylish-haskell -i `git ls-files -- '*.hs'`
 
 git diff --exit-code
diff --git a/.buildkite/default.nix b/.buildkite/default.nix
@@ -8,7 +8,7 @@ let
     gnused gnugrep coreutils git nix gnumake gnutar gzip lz4
     stack haskell-build-tools.weeder
   ];
-  libs = ps: with ps; [turtle safe transformers extra async];
+  libs = ps: with ps; [turtle safe transformers extra async digest];
   ghc' = haskellPackages.ghcWithPackages libs;
 
   # Include the stack nix-shell in closure of stackRebuild, so that it

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -4,7 +4,6 @@ env:
   CACHE_DIR: "/cache/cardano-wallet"
   LC_ALL: "en_US.UTF-8"
   TESTS_LOGDIR: "/tmp/wallet-integration-logs"
-  TESTS_RETRY_FAILED: "yes"
 
 steps:
   - label: 'Prevent merging to wrong branch'
@@ -27,42 +26,48 @@ steps:
     agents:
       system: x86_64-linux
 
-  - label: 'Check Cabal Configure (Haskell.nix shellFor)'
-    command:
-      - 'nix-shell --run "cabal update"'
-      - 'nix-shell --run "cabal configure --project-file=cabal-nix.project --enable-tests --enable-benchmarks"'
-      - 'nix-shell --run "cabal configure --project-file=cabal-nix.project -frelease --enable-tests --enable-benchmarks"'
-    agents:
-      system: x86_64-linux
-
   - label: 'Check Cabal Configure'
     command: 'nix-shell nix/cabal-shell.nix --run "scripts/buildkite/cabal-ci.sh configure"'
     agents:
       system: x86_64-linux
 
   - label: 'Check auto-generated Nix'
+    key: nix
     commands:
       - './nix/regenerate.sh --cache /dev/null'
       - 'nix-build ./nix -A iohkNix.checkStackProject -o check-stack-project.sh && ./check-stack-project.sh'
     agents:
       system: x86_64-linux
 
+  - label: 'Check Cabal Configure (Haskell.nix shellFor)'
+    depends_on: nix
+    command:
+      - 'nix-shell --run "echo --- Cabal update ; cabal update"'
+      - 'nix-shell --run "echo +++ Cabal configure ; cabal configure --enable-tests --enable-benchmarks"'
+      - 'nix-shell --run "echo +++ Cabal configure -frelease ; cabal configure -frelease --enable-tests --enable-benchmarks"'
+    agents:
+      system: x86_64-linux
+
   - label: 'Check Stylish Haskell'
+    depends_on: nix
     command: 'nix-shell --run .buildkite/check-stylish.sh'
     agents:
       system: x86_64-linux
 
   - label: 'HLint'
-    command: 'nix-shell --run "hlint lib"'
+    depends_on: nix
+    command: 'nix-shell --run "echo +++ HLint ; hlint lib"'
     agents:
       system: x86_64-linux
 
   - label: 'Validate OpenAPI Specification'
-    command: 'nix-shell --run "openapi-spec-validator --schema 3.0.0 specifications/api/swagger.yaml"'
+    depends_on: nix
+    command: 'nix-shell --run "echo +++ openapi-spec-validator ; openapi-spec-validator --schema 3.0.0 specifications/api/swagger.yaml"'
     agents:
       system: x86_64-linux
 
   - label: 'Docker Image'
+    depends_on: nix
     command:
       - "nix-build .buildkite/docker-build-push.nix --argstr dockerHubRepoName inputoutput/cardano-wallet -o docker-build-push"
       - "./docker-build-push"
@@ -72,11 +77,15 @@ steps:
       - exit_status: '*'
 
   - label: 'TODO list'
+    depends_on: nix
     command: 'nix-shell --run scripts/todo-list.sh'
     agents:
       system: x86_64-linux
 
   - label: 'Lint bash shell scripts'
-    command: './scripts/shellcheck.sh'
+    depends_on: nix
+    commands:
+      - 'echo +++ Shellcheck'
+      - './scripts/shellcheck.sh'
     agents:
       system: x86_64-linux