Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/ci_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion crates/cli/tests/cli_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -1250,7 +1251,7 @@ fn wait_for_port_closed(address: SocketAddr) {
}

fn wait_for_owned_sidecar(temp: &std::path::Path, previous_pid: Option<u64>) -> 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)
Expand Down
Loading