From 49a671f7231d2d5bb2e1e9087ed953db123b2a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Thu, 7 Mar 2024 10:34:37 +0100 Subject: [PATCH 1/3] Update cardano-ping to the same version as cardano-cli's version --- cabal.project | 4 ++-- cardano-testnet/CHANGELOG.md | 4 ++++ cardano-testnet/cardano-testnet.cabal | 2 +- flake.lock | 12 ++++++------ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cabal.project b/cabal.project index fbdb1810247..23427588828 100644 --- a/cabal.project +++ b/cabal.project @@ -13,8 +13,8 @@ repository cardano-haskell-packages -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them index-state: - , hackage.haskell.org 2024-02-27T08:06:51Z - , cardano-haskell-packages 2024-02-26T17:55:44Z + , hackage.haskell.org 2024-03-07T07:48:20Z + , cardano-haskell-packages 2024-03-05T10:16:08Z packages: cardano-git-rev diff --git a/cardano-testnet/CHANGELOG.md b/cardano-testnet/CHANGELOG.md index 2b7bd24c96f..4264e57f015 100644 --- a/cardano-testnet/CHANGELOG.md +++ b/cardano-testnet/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for cardano-testnet +## Next version + +* Update `cardano-ping` dependency + ## 8.7.0 * Using `cardano-node-8.7.0`, `cardano-api-8.33` and `cardano-cli-8.15` diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index 62d43a59c39..186967ed444 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -48,7 +48,7 @@ library , cardano-ledger-core:testlib , cardano-ledger-shelley , cardano-node - , cardano-ping ^>= 0.2.0.10 + , cardano-ping ^>= 0.2.0.13 , contra-tracer , containers , data-default-class diff --git a/flake.lock b/flake.lock index bd63cb4a4d6..ab7ed4eda5d 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1708970955, - "narHash": "sha256-k6Y9WjDej7wCkUowVi/tdsWP6EWUMZTSRU9r+4lMJmU=", + "lastModified": 1709731402, + "narHash": "sha256-7h4/ns3WRI3BtK1FbUEm6nMqW1ahNNehiHr7eQ03muk=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "f09964311e8894a5f09e258f308a9c3d4221f029", + "rev": "8e4f211a8e537c8c939b65e887556bd7441c774c", "type": "github" }, "original": { @@ -624,11 +624,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1708993343, - "narHash": "sha256-8EbbR5ReQK61yP/7VYtFSCerBXSE59VtfV+Wahdsuqg=", + "lastModified": 1709770751, + "narHash": "sha256-mL09hxG1rOpC01xXT2CriE1dfSVgSHxW2QaPOYJxjvA=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "f823c9258e9316cb4da256fc93e9c0407f0c296a", + "rev": "bb33c267712d3d27329eed24f67ab027cb48a1f0", "type": "github" }, "original": { From 850e5b402e9d99c27f20a5f548cefb6d99487c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Thu, 7 Mar 2024 12:45:43 +0100 Subject: [PATCH 2/3] Invalidate cabal cache --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 81581785612..f49ce049eb8 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -38,7 +38,7 @@ jobs: env: # Modify this value to "invalidate" the cabal cache. - CABAL_CACHE_VERSION: "2024-02-29" + CABAL_CACHE_VERSION: "2024-03-07" concurrency: group: > From 4c6860d0cd6b7b7049351513426fc913f2db35d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Fri, 8 Mar 2024 16:35:57 +0100 Subject: [PATCH 3/3] Retrigger CI --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 1e3d367fc26..cbef54174a0 100644 --- a/README.rst +++ b/README.rst @@ -16,9 +16,9 @@ .. contents:: Contents -************************* +******************************************* Overview of the ``cardano-node`` repository -************************* +******************************************* Integration of the `ledger `_, `consensus `_, `networking `_ and