Skip to content
Merged
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
19 changes: 19 additions & 0 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[build]
pre-build = [
# Use HTTPS for package sources
"apt-get update && apt-get install --assume-yes --no-install-recommends ca-certificates",
"find /etc/apt/ -type f \\( -name '*.list' -o -name '*.sources' \\) -exec sed -i 's|http://|https://|g' {} +",

# Configure APT retries and timeouts to handle network issues
"echo 'Acquire::Retries \"3\";' > /etc/apt/apt.conf.d/80-retries",
"echo 'Acquire::http::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
"echo 'Acquire::ftp::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
Comment on lines +8 to +10
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Add HTTPS timeout since sources are switched to HTTPS.

Line 5 rewrites APT sources to https://, but Lines 9-10 only configure http/ftp timeouts. Add Acquire::https::Timeout so retry/timeout hardening applies to the protocol actually used.

🔧 Suggested patch
     "echo 'Acquire::Retries \"3\";' > /etc/apt/apt.conf.d/80-retries",
     "echo 'Acquire::http::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
+    "echo 'Acquire::https::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
     "echo 'Acquire::ftp::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"echo 'Acquire::Retries \"3\";' > /etc/apt/apt.conf.d/80-retries",
"echo 'Acquire::http::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
"echo 'Acquire::ftp::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
"echo 'Acquire::Retries \"3\";' > /etc/apt/apt.conf.d/80-retries",
"echo 'Acquire::http::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
"echo 'Acquire::https::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
"echo 'Acquire::ftp::Timeout \"60\";' >> /etc/apt/apt.conf.d/80-retries",
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@Cross.toml` around lines 8 - 10, Add an HTTPS timeout entry to the APT retry
config so the timeout/retry hardening applies to the rewritten HTTPS sources:
after the existing echo lines that create /etc/apt/apt.conf.d/80-retries (the
lines writing Acquire::http::Timeout and Acquire::ftp::Timeout), add a similar
echo for Acquire::https::Timeout with the same value (e.g., "60") so the file
includes Acquire::https::Timeout "60";.


# rust-bindgen dependencies: llvm-dev libclang-dev (>= 10) clang (>= 10)
# Required for reth-mdbx-sys compilation.
# See: https://github.com/cross-rs/cross/wiki/FAQ#using-clang--bindgen
"apt-get update && apt-get install --assume-yes --no-install-recommends llvm-dev libclang-dev clang",
]

[build.env]
passthrough = ["JEMALLOC_SYS_WITH_LG_PAGE"]
Loading