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

Test CI with update to RELEASE_NOTES #2

Merged
merged 1 commit into from
Sep 11, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/full_ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: full CI

on:
push:
branches: [ "main" ]
merge_group:
pull_request:
types: [opened, synchronize, reopened]
Expand Down Expand Up @@ -56,7 +58,7 @@ jobs:

build_channels_windows:
name: Build Channels Windows
runs-on: windows-2022
runs-on: windows-2019
env:
OS: windows
strategy:
Expand Down
31 changes: 7 additions & 24 deletions ci/install-rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,13 @@ if [ -n "$INSTALL_RUST_SRC" ]; then
fi

if [ "$OS" = "windows" ]; then
if [ "$ARCH_BITS" = "i686" ]; then
echo "Install MinGW32"
choco install mingw --x86 --force
fi

echo "Find GCC libraries"
gcc -print-search-dirs
/usr/bin/find "C:\ProgramData\Chocolatey" -name "crt2*"
/usr/bin/find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
/usr/bin/find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"

if [ -n "$ARCH_BITS" ]; then
echo "Fix MinGW"
for i in crt2.o dllcrt2.o libmingwex.a libmsvcrt.a ; do
cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw$ARCH_BITS/$ARCH-w64-mingw32/lib/$i" "$(rustc --print sysroot)/lib/rustlib/$TARGET/lib"
done
fi

# Install Wintun
echo "Install Wintun"
curl.exe -o wintun.zip https://www.wintun.net/builds/wintun-0.14.1.zip
powershell.exe -NoP -NonI -Command "Expand-Archive './wintun.zip' './'"
cp -f "./wintun/bin/amd64/wintun.dll" "./"
rm -rf "./wintun"
# Install Npcap
curl.exe -o "C:/npcap-sdk.zip" "https://npcap.com/dist/npcap-sdk-0.zip"
powershell.exe -NoP -NonI -Command "Expand-Archive -LiteralPath C:/npcap-sdk.zip -DestinationPath C:/"
cp "C:/npcap-sdk/Lib/x64/Packet.lib" "C:/Packet.lib"
cp "C:/npcap-sdk/Lib/x64/Packet.lib" "./Packet.lib"
curl.exe -o "C:/npcap.exe" "https://github.com/nmap/npcap/releases/download/v0.80/npcap-0.80.exe"
C:/npcap.exe "/S"
fi

echo "Query rust and cargo versions"
Expand Down
8 changes: 3 additions & 5 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@ done

case "${OS}" in
windows*)
cargo test --features wintun

cargo test --features wintun-runtime
cargo test

cargo test --features tapwin6
cargo test --features npcap

cargo test --features tapwin6-runtime
cargo test --features npcap-runtime
;;
*)
# No extra features in any platform other than windows
Expand Down
2 changes: 1 addition & 1 deletion rscap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ dlopen2_derive = { version = "0.4" }
pkts-common = { version = "0.1.0" }

[target.'cfg(windows)'.dependencies]
windows-sys = { version = "0.59", features = ["Win32","Win32_Networking", "Win32_Networking_WinSock", "Win32_System", "Win32_System_IO", "Win32_System_Kernel", "Win32_System_Threading"] }
windows-sys = { version = "0.59", features = ["Win32_Networking_WinSock", "Win32_NetworkManagement_IpHelper", "Win32_System_IO", "Win32_System_Kernel", "Win32_System_Threading"] }
4 changes: 4 additions & 0 deletions rscap/RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release History:

* 0.2.0 (2024-09-09)
- Split out `rscap` and `pkts` into separate crates
- Introduce CI pipeline

* 0.1.1 (2023-03-23)
- Cleanup of unstable/unused APIs

Expand Down
Loading