From 51ce18ab70ce375232562ef3ae8b9b4e9025b9b8 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 1 Jul 2024 20:00:53 +0200 Subject: [PATCH 1/3] radicle-node: 1.0.0-rc.11 -> 1.0.0-rc.12 Signed-off-by: Florian Brandes --- pkgs/by-name/ra/radicle-node/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 05324f6ff44a..9fea1e9f436a 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -16,15 +16,15 @@ , xdg-utils }: rustPlatform.buildRustPackage rec { pname = "radicle-node"; - version = "1.0.0-rc.11"; + version = "1.0.0-rc.12"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; - hash = "sha256-P1Gg2uk87ppco7CAPjEqN0uqgb0K8apOSC7cfdgaT0Y="; + hash = "sha256-bXFhufmMgJ+bX4PASIUPmNQ2L5Y8LHJ+pLevpJAYkYc="; }; - cargoHash = "sha256-M01NjqvMSaa3+YPb4vDtIucBeF5BYx3cpmMoLJOwRsI="; + cargoHash = "sha256-CAxy9J5bOPHedf6g7TEfM35F+Batom6g2V3k7CPC8Sk="; nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ]; nativeCheckInputs = [ git ]; From 67ddd2e0aa42aa397b14b548d744f853308f406b Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 2 Jul 2024 15:51:39 +0200 Subject: [PATCH 2/3] radicle-node: skip flaky test Signed-off-by: Florian Brandes --- pkgs/by-name/ra/radicle-node/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 9fea1e9f436a..5a56f1d8aecb 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -44,6 +44,8 @@ "--skip=tests::test_announcement_relay" # https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Flaky.20tests/near/438352360 "--skip=tests::e2e::test_connection_crossing" + # https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Clone.20Partial.20Fail.20Flake + "--skip=rad_clone_partial_fail" ]; postInstall = '' From f27d5f0de59d66ce1b3ca9b4351fb2b69a882117 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 6 Jul 2024 20:18:46 +0200 Subject: [PATCH 3/3] radicle-node: don't test on aarch64 Signed-off-by: Florian Brandes Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/by-name/ra/radicle-node/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 5a56f1d8aecb..7453899f8b06 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -32,7 +32,8 @@ darwin.apple_sdk.frameworks.Security ]; - doCheck = stdenv.hostPlatform.isLinux; + # tests regularly time out on aarch64 + doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; preCheck = '' export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release