mirror of
https://github.com/domcyrus/rustnet.git
synced 2026-05-25 06:58:47 -05:00
feat: reorganize platform code into per-platform directories (#81)
* feat: reorganize platform code into per-platform directories - Move platform files into linux/, macos/, windows/, freebsd/ subdirectories - Unify create_process_lookup() API with _use_pktap parameter across all platforms - Update build.rs paths for eBPF program location - Reduce cfg attributes in main mod.rs from ~42 to 8 * fix: widen tolerance for test_sliding_window_no_skip_first_sample Increase acceptable range from 9000-11000 to 5000-15000 to account for timing variability on macOS ARM CI runners. * docs: update Linux build dependencies and remove EBPF_BUILD.md - Add missing build-essential, pkg-config, zlib1g-dev to documentation - Update rust.yml CI with complete dependencies - Remove EBPF_BUILD.md (info already in INSTALL.md) - Update references in README.md and ARCHITECTURE.md
This commit is contained in:
@@ -6,6 +6,9 @@ on:
|
||||
- "v[0-9]+.[0-9]+.[0-9]+"
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
update-aur:
|
||||
name: update-aur
|
||||
|
||||
@@ -20,6 +20,9 @@ on:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
env:
|
||||
DEBEMAIL: cadetg@gmail.com
|
||||
DEBFULLNAME: Marco Cadetg
|
||||
|
||||
@@ -6,6 +6,9 @@ on:
|
||||
- "v[0-9]+.[0-9]+.[0-9]+"
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
@@ -25,6 +25,9 @@ on:
|
||||
- "v[0-9]+.[0-9]+.[0-9]+"
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
env:
|
||||
RUST_BACKTRACE: 1
|
||||
RUSTNET_ASSET_DIR: assets
|
||||
|
||||
@@ -21,6 +21,9 @@ on:
|
||||
- '.github/workflows/rust.yml'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
@@ -30,7 +33,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get update && sudo apt-get install -y libpcap-dev libelf-dev clang llvm
|
||||
run: sudo apt-get update && sudo apt-get install -y libpcap-dev libelf-dev zlib1g-dev clang llvm pkg-config
|
||||
- name: Build
|
||||
run: cargo build --verbose
|
||||
- name: Run tests
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
name: Test FreeBSD Build
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
pull_request:
|
||||
paths:
|
||||
- 'Cargo.toml'
|
||||
- 'build.rs'
|
||||
- 'src/**'
|
||||
- '.github/workflows/test-freebsd.yml'
|
||||
|
||||
env:
|
||||
RUST_BACKTRACE: 1
|
||||
|
||||
jobs:
|
||||
test-freebsd-build:
|
||||
name: Test FreeBSD x64 Build
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Build and test on FreeBSD
|
||||
uses: vmactions/freebsd-vm@b9c3f24600acdef618ef1c9e2d3c6eeda4dce712 # v1.2.7
|
||||
with:
|
||||
usesh: true
|
||||
prepare: |
|
||||
pkg install -y curl libpcap rust
|
||||
run: |
|
||||
echo "Building for FreeBSD without default features (no eBPF)"
|
||||
cargo build --verbose --release --no-default-features
|
||||
|
||||
echo "Verifying binary was created"
|
||||
if [ -f "target/release/rustnet" ]; then
|
||||
echo "✅ FreeBSD binary successfully built"
|
||||
ls -lh target/release/rustnet
|
||||
else
|
||||
echo "❌ FreeBSD binary not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Upload binary as artifact
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: rustnet-freebsd-x64
|
||||
path: target/release/rustnet
|
||||
if-no-files-found: error
|
||||
@@ -0,0 +1,190 @@
|
||||
name: Test Platform Builds
|
||||
|
||||
# Test builds on all supported platforms.
|
||||
# Runs automatically on PRs and can be triggered manually for specific platforms.
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
platform:
|
||||
description: 'Platform to build'
|
||||
required: true
|
||||
type: choice
|
||||
options:
|
||||
- all
|
||||
- linux
|
||||
- macos
|
||||
- windows
|
||||
- freebsd
|
||||
pull_request:
|
||||
paths:
|
||||
- 'Cargo.toml'
|
||||
- 'build.rs'
|
||||
- 'src/**'
|
||||
- '.github/workflows/test-platform-builds.yml'
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
env:
|
||||
RUST_BACKTRACE: 1
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
name: Build Linux (x64)
|
||||
if: ${{ github.event_name == 'pull_request' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }}
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y libpcap-dev libelf-dev zlib1g-dev clang llvm pkg-config
|
||||
|
||||
- name: Install Rust
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
|
||||
- name: Build
|
||||
run: cargo build --verbose --release
|
||||
|
||||
- name: Run tests
|
||||
run: cargo test --verbose
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: rustnet-linux-x64
|
||||
path: target/release/rustnet
|
||||
if-no-files-found: error
|
||||
|
||||
build-macos-intel:
|
||||
name: Build macOS (Intel)
|
||||
if: ${{ github.event_name == 'pull_request' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
|
||||
runs-on: macos-14
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Install Rust
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
with:
|
||||
targets: x86_64-apple-darwin
|
||||
|
||||
- name: Build
|
||||
run: cargo build --verbose --release --target x86_64-apple-darwin --no-default-features
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: rustnet-macos-intel
|
||||
path: target/x86_64-apple-darwin/release/rustnet
|
||||
if-no-files-found: error
|
||||
|
||||
build-macos-arm:
|
||||
name: Build macOS (Apple Silicon)
|
||||
if: ${{ github.event_name == 'pull_request' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
|
||||
runs-on: macos-14
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Install Rust
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
with:
|
||||
targets: aarch64-apple-darwin
|
||||
|
||||
- name: Build
|
||||
run: cargo build --verbose --release --target aarch64-apple-darwin --no-default-features
|
||||
|
||||
- name: Run tests
|
||||
run: cargo test --verbose
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: rustnet-macos-arm
|
||||
path: target/aarch64-apple-darwin/release/rustnet
|
||||
if-no-files-found: error
|
||||
|
||||
build-windows-x64:
|
||||
name: Build Windows (64-bit)
|
||||
if: ${{ github.event_name == 'pull_request' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Install Rust
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
with:
|
||||
targets: x86_64-pc-windows-msvc
|
||||
|
||||
- name: Build
|
||||
run: cargo build --verbose --release --target x86_64-pc-windows-msvc --no-default-features
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: rustnet-windows-x64
|
||||
path: target/x86_64-pc-windows-msvc/release/rustnet.exe
|
||||
if-no-files-found: error
|
||||
|
||||
build-windows-x86:
|
||||
name: Build Windows (32-bit)
|
||||
if: ${{ github.event_name == 'pull_request' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Install Rust
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
with:
|
||||
targets: i686-pc-windows-msvc
|
||||
|
||||
- name: Build
|
||||
run: cargo build --verbose --release --target i686-pc-windows-msvc --no-default-features
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: rustnet-windows-x86
|
||||
path: target/i686-pc-windows-msvc/release/rustnet.exe
|
||||
if-no-files-found: error
|
||||
|
||||
build-freebsd:
|
||||
name: Build FreeBSD (x64)
|
||||
if: ${{ github.event_name == 'pull_request' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'freebsd' }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Build on FreeBSD
|
||||
uses: vmactions/freebsd-vm@b9c3f24600acdef618ef1c9e2d3c6eeda4dce712 # v1.2.7
|
||||
with:
|
||||
usesh: true
|
||||
prepare: |
|
||||
pkg install -y curl libpcap rust
|
||||
run: |
|
||||
echo "Building for FreeBSD without default features (no eBPF)"
|
||||
cargo build --verbose --release --no-default-features
|
||||
|
||||
echo "Verifying binary was created"
|
||||
if [ -f "target/release/rustnet" ]; then
|
||||
echo "FreeBSD binary successfully built"
|
||||
ls -lh target/release/rustnet
|
||||
else
|
||||
echo "FreeBSD binary not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: rustnet-freebsd-x64
|
||||
path: target/release/rustnet
|
||||
if-no-files-found: error
|
||||
Reference in New Issue
Block a user