From a0e816c492d6f1e0e74f5f6d803f6e39601041cc Mon Sep 17 00:00:00 2001 From: Aya Hassan Date: Sun, 7 Jun 2026 14:42:14 +0200 Subject: [PATCH] Fix review comments --- .github/workflows/fleet_tests.yml | 2 +- .github/workflows/pr_tests.yml | 21 ++++----------------- src/node/wrapper_helpers.py | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/fleet_tests.yml b/.github/workflows/fleet_tests.yml index 13a6552f2..64b3909b1 100644 --- a/.github/workflows/fleet_tests.yml +++ b/.github/workflows/fleet_tests.yml @@ -6,7 +6,7 @@ concurrency: on: schedule: - - cron: '0 2 * * *' + - cron: '0 2 * * 0' workflow_dispatch: inputs: node1: diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index 24b86a30e..7e2a5c395 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -44,7 +44,7 @@ jobs: run: | BINDINGS_HASH=$(git rev-parse HEAD:vendor/logos-delivery-python-bindings) DELIVERY_HASH=$(git -C vendor/logos-delivery-python-bindings rev-parse HEAD:vendor/logos-delivery) - echo "key=liblogosdelivery-${{ runner.os }}-nim2.2.4-v3-${BINDINGS_HASH}-${DELIVERY_HASH}" >> "$GITHUB_OUTPUT" + echo "key=liblogosdelivery-${{ runner.os }}-nim2.2.4-${BINDINGS_HASH}-${DELIVERY_HASH}" >> "$GITHUB_OUTPUT" - name: Cache liblogosdelivery.so id: cache-lib @@ -79,9 +79,7 @@ jobs: echo "$HOME/.nimble/bin" >> "$GITHUB_PATH" export PATH="$HOME/.nimble/bin:$PATH" choosenim 2.2.4 - # Pin the nimble that generated logos-delivery's nimble.lock. A newer - # nimble recomputes the locked Nim package checksum differently, which - # makes `nimble setup --localdeps` abort with a checksum mismatch. + # Pin the nimble that generated nimble.lock; newer ones fail the checksum. (cd /tmp && nimble install "nimble@0.22.3" -y) nim --version nimble --version @@ -102,19 +100,8 @@ jobs: ln -sf waku.nimble waku.nims - # `make liblogosdelivery` resolves the locked deps via - # `nimble setup --localdeps` (build-deps prerequisite); a bare - # `nimble install -y` here is redundant and pulls Nim from the lock, - # which is what triggered the checksum mismatch. - # - # -d:disableMarchNative: without it config.nims compiles with - # -march=native, and the cached .so then crashes with SIGILL - # ("Illegal instruction") when a later job lands on a runner with - # an older CPU generation. -d:marchOptimized keeps a portable - # x86-64-v2 baseline, which all GitHub-hosted runners support. - # Passed via the environment (not a make argument) so the - # Makefile's own NIM_PARAMS appends (-d:release, git_version) - # still apply. + # Portable build (no -march=native) so the cached .so doesn't SIGILL + # on runners with older CPUs; via env so the Makefile's NIM_PARAMS apply. NIM_PARAMS="-d:disableMarchNative -d:marchOptimized" make liblogosdelivery SO_PATH="$(find . -type f -name 'liblogosdelivery.so' | head -n 1)" diff --git a/src/node/wrapper_helpers.py b/src/node/wrapper_helpers.py index d630e5827..972f29d0a 100644 --- a/src/node/wrapper_helpers.py +++ b/src/node/wrapper_helpers.py @@ -211,7 +211,7 @@ def get_node_tcp_port(node) -> int: def get_node_bound_ports(node) -> dict: - """Return the MyBoundPorts debug info (logos-delivery#3828) as a dict. + """Return the MyBoundPorts debug info . Keys: tcp, webSocket, rest, discv5Udp, metrics. A value of 0 means the service is disabled or did not bind.