From 217809732d299f8fab0d0165e02aee462cf6a312 Mon Sep 17 00:00:00 2001 From: Will Killian Date: Wed, 15 Jul 2026 11:42:02 -0400 Subject: [PATCH] test: stabilize ARM runner setup Signed-off-by: Will Killian --- .github/workflows/ci_rust.yml | 13 ++++++++++--- crates/cli/tests/cli_tests.rs | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index e6e7d810a..bd554bb34 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -237,9 +237,16 @@ jobs: - name: Install musl tools if: ${{ startsWith(matrix.target, 'x86_64-unknown-linux-musl') || startsWith(matrix.target, 'aarch64-unknown-linux-musl') }} run: | - set -e - sudo apt-get update - sudo apt-get install -y musl-tools + set -euo pipefail + if [ "${{ runner.arch }}" = "ARM64" ]; then + for sources in /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources; do + if [ -f "$sources" ]; then + sudo sed -i 's|http://ports.ubuntu.com/ubuntu-ports|https://ports.ubuntu.com/ubuntu-ports|g' "$sources" + fi + done + fi + sudo apt-get -o Acquire::Retries=5 update + sudo apt-get -o Acquire::Retries=5 install -y musl-tools - name: Build CLI release binary working-directory: ${{ env.NEMO_RELAY_CI_WORKSPACE }} diff --git a/crates/cli/tests/cli_tests.rs b/crates/cli/tests/cli_tests.rs index f34986490..245760281 100644 --- a/crates/cli/tests/cli_tests.rs +++ b/crates/cli/tests/cli_tests.rs @@ -24,6 +24,7 @@ fn gateway_bin() -> &'static str { } const ACTIVE_GENERATION_TOKEN: &str = "active-generation"; +const SIDECAR_PUBLICATION_TIMEOUT: Duration = Duration::from_secs(30); fn write_active_generation(temp: &std::path::Path) -> std::path::PathBuf { let generation = temp.join("plugin/.nemo-relay-generation"); @@ -1250,7 +1251,7 @@ fn wait_for_port_closed(address: SocketAddr) { } fn wait_for_owned_sidecar(temp: &std::path::Path, previous_pid: Option) -> serde_json::Value { - let deadline = Instant::now() + Duration::from_secs(10); + let deadline = Instant::now() + SIDECAR_PUBLICATION_TIMEOUT; loop { for path in find_runtime_files_matching(temp, "sidecar-", ".owner.json") { if let Ok(raw) = std::fs::read(path)