From bb5972b7e20854cc4a8288dece19797261d3ca49 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 14 Dec 2023 17:27:37 +0100 Subject: [PATCH] test(core): update monero tests binary [no changelog] --- .github/workflows/core-hw.yml | 2 +- core/tests/run_tests_device_emu_monero.sh | 4 ++-- shell.nix | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/core-hw.yml b/.github/workflows/core-hw.yml index fbe9e7d35d..cdeae38e60 100644 --- a/.github/workflows/core-hw.yml +++ b/.github/workflows/core-hw.yml @@ -93,7 +93,7 @@ jobs: - run: | # log serial console to file; sleep is used because tio needs stdin that is not /dev/null nix-shell --arg hardwareTest true --run "sleep 8h | tio --no-autoconnect /dev/ttyTREZOR &> trezor.log" & - nix-shell --arg fullDeps true --run "./core/tests/run_tests_device_emu_monero.sh $TESTOPTS" + nix-shell --arg fullDeps true --run "./core/tests/run_tests_device_emu_monero.sh --trezor-path webusb:" - run: tail -n50 trezor.log || true if: failure() - uses: actions/upload-artifact@v4 diff --git a/core/tests/run_tests_device_emu_monero.sh b/core/tests/run_tests_device_emu_monero.sh index 40fb5383de..13ec8310ae 100755 --- a/core/tests/run_tests_device_emu_monero.sh +++ b/core/tests/run_tests_device_emu_monero.sh @@ -23,8 +23,8 @@ fi # When updating URL and sha256sum also update the URL in ci/shell.nix. error=1 -: "${TREZOR_MONERO_TESTS_URL:=https://github.com/ph4r05/monero/releases/download/v0.18.1.1-dev-tests-u18.04-02/trezor_tests}" -: "${TREZOR_MONERO_TESTS_SHA256SUM:=81424cfc3965abdc24de573274bf631337b52fd25cefc895513214c613fe05c9}" +: "${TREZOR_MONERO_TESTS_URL:=https://github.com/ph4r05/monero/releases/download/v0.18.3.1-dev-tests-u18.04-01/trezor_tests}" +: "${TREZOR_MONERO_TESTS_SHA256SUM:=d8938679b69f53132ddacea1de4b38b225b06b37b3309aa17911cfbe09b70b4a}" : "${TREZOR_MONERO_TESTS_PATH:=$CORE_DIR/tests/trezor_monero_tests}" : "${TREZOR_MONERO_TESTS_LOG:=$CORE_DIR/tests/trezor_monero_tests.log}" : "${TREZOR_MONERO_TESTS_CHAIN:=$CORE_DIR/tests/trezor_monero_tests.chain}" diff --git a/shell.nix b/shell.nix index a88bc2a81d..38f7dc86e9 100644 --- a/shell.nix +++ b/shell.nix @@ -39,13 +39,16 @@ let sha256 = "02s3qkb6kz3ndyx7rfndjbvp4vlwiqc42fxypn3g6jnc0v5jyz95"; }) { }; moneroTests = nixpkgs.fetchurl { - url = "https://github.com/ph4r05/monero/releases/download/v0.18.1.1-dev-tests-u18.04-02/trezor_tests"; - sha256 = "81424cfc3965abdc24de573274bf631337b52fd25cefc895513214c613fe05c9"; + url = "https://github.com/ph4r05/monero/releases/download/v0.18.3.1-dev-tests-u18.04-01/trezor_tests"; + sha256 = "d8938679b69f53132ddacea1de4b38b225b06b37b3309aa17911cfbe09b70b4a"; }; moneroTestsPatched = nixpkgs.runCommandCC "monero_trezor_tests" {} '' cp ${moneroTests} $out chmod +wx $out - ${nixpkgs.patchelf}/bin/patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out" + ${nixpkgs.patchelf}/bin/patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --add-rpath "${nixpkgs.udev}/lib" \ + "$out" chmod -w $out ''; # do not expose rust's gcc: https://github.com/oxalica/rust-overlay/issues/70