Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support {Free|Net|Open}BSD #2311

Merged
merged 35 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
59fb6cd
ci: add bsd variants
dignifiedquire May 19, 2024
843dd11
fixup
dignifiedquire May 19, 2024
17e420a
first pass at applying patch
dignifiedquire May 19, 2024
3004582
start patching libc
dignifiedquire May 19, 2024
2667ef9
more import fixes
dignifiedquire May 19, 2024
172c2b8
more libc fixes
dignifiedquire May 19, 2024
4fa710b
fixups
dignifiedquire May 19, 2024
0328666
naming is hard
dignifiedquire May 19, 2024
851661f
fmt
dignifiedquire May 19, 2024
cddd3ba
move freebsd to build only for now
dignifiedquire May 19, 2024
821d7e8
restructure
dignifiedquire May 21, 2024
fd697d9
add netbsd, improve freebsd
dignifiedquire May 21, 2024
87199b4
fixups
dignifiedquire May 21, 2024
3b18254
exports
dignifiedquire May 21, 2024
59b80a6
exports
dignifiedquire May 21, 2024
78e95a7
todo
dignifiedquire May 21, 2024
96dec5a
fixup
dignifiedquire May 21, 2024
e6debd2
parse interface announce message
dignifiedquire May 21, 2024
11ad5d8
patched iroh-quinn
dignifiedquire May 21, 2024
c528eeb
exports
dignifiedquire May 21, 2024
c027227
implement openbsd route parsing
dignifiedquire May 21, 2024
71e3ad0
add openbsd
dignifiedquire May 21, 2024
f931e73
openbsd fixes
dignifiedquire May 21, 2024
2ed39c3
update rcgen
dignifiedquire May 21, 2024
5f449e2
fixup warnings
dignifiedquire May 21, 2024
0e8d824
fix openbsd
dignifiedquire May 21, 2024
6aa9b41
ci: disable i686 freebsd, link errors
dignifiedquire May 21, 2024
cb94821
ci: add netbsd compile check
dignifiedquire May 21, 2024
0a8385c
removed unused constants
dignifiedquire May 21, 2024
13e34f3
update some constants
dignifiedquire May 21, 2024
9bb11a1
update constants
dignifiedquire May 21, 2024
29112cf
netbsd: remove resolve
dignifiedquire May 22, 2024
323abbc
switch to release quinn
dignifiedquire May 24, 2024
fc4eacf
Merge branch 'main' into fix-free-bsd
dignifiedquire May 24, 2024
d4e7ba3
Disable upstream quinn on bsd
flub May 24, 2024
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
43 changes: 36 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,23 @@ jobs:
if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
uses: './.github/workflows/tests.yaml'

cross:
cross_build:
name: Cross Build Only
if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
timeout-minutes: 30
name: Cross compile
runs-on: [self-hosted, linux, X64]
strategy:
fail-fast: false
matrix:
target:
- i686-unknown-linux-gnu
# cross tests are currently broken vor armv7 and aarch64
# see https://github.com/cross-rs/cross/issues/1311
- armv7-linux-androideabi
- aarch64-linux-android
# Freebsd execution fails in cross
# - i686-unknown-freebsd # Linking fails :/
- x86_64-unknown-freebsd
- x86_64-unknown-netbsd
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -59,15 +64,39 @@ jobs:
# cross tests are currently broken vor armv7 and aarch64
# see https://github.com/cross-rs/cross/issues/1311. So on
# those platforms we only build but do not run tests.
if: matrix.target != 'i686-unknown-linux-gnu'
run: cross build --all --target ${{ matrix.target }}
env:
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG'}}

cross_test:
Copy link
Contributor

Choose a reason for hiding this comment

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

does splitting this off speed up things? Because this way the compiling is done twice in two different jobs that don't share build caches, so intuitively I'd expect it to be slower as we don't have enough runners to parallelise enough to make this worth it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I split it up because one is just building, and the other is testing

Copy link
Contributor

Choose a reason for hiding this comment

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

but once they both work maybe it should be merged back into one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, but that won't happen soon I think

name: Cross Test
if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
timeout-minutes: 30
runs-on: [self-hosted, linux, X64]
strategy:
fail-fast: false
matrix:
target:
- i686-unknown-linux-gnu
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install rust stable
uses: dtolnay/rust-toolchain@stable

- name: Cleanup Docker
continue-on-error: true
run: |
docker kill $(docker ps -q)

- name: Install cross
# See https://github.com/cross-rs/cross/issues/1222
run: cargo install cross --git https://github.com/cross-rs/cross

- name: test
# cross tests are currently broken vor armv7 and aarch64
# see https://github.com/cross-rs/cross/issues/1311
if: matrix.target == 'i686-unknown-linux-gnu'
run: cross test --all --target ${{ matrix.target }} -- --test-threads=12
env:
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG' }}
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions iroh-net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ parking_lot = "0.12.1"
pin-project = "1"
pkarr = { version = "1.1.4", default-features = false, features = ["async", "relay"] }
postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
quinn = { package = "iroh-quinn", version = "0.10.4" }
quinn-proto = { package = "iroh-quinn-proto", version = "0.10.7" }
quinn-udp = { package = "iroh-quinn-udp", version = "0.4" }
quinn = { package = "iroh-quinn", version = "0.10.5" }
quinn-proto = { package = "iroh-quinn-proto", version = "0.10.8" }
quinn-udp = { package = "iroh-quinn-udp", version = "0.4.2" }
rand = "0.8"
rand_core = "0.6.4"
rcgen = "0.11"
rcgen = "0.12"
reqwest = { version = "0.12.4", default-features = false, features = ["rustls-tls"] }
ring = "0.17"
rustls = { version = "0.21.11", default-features = false, features = ["dangerous_configuration"] }
Expand Down
Loading
Loading