jason/socktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix windows build after ssl feature and optimize build

Browse Source
This commit is contained in:
jasonwitty 2025-08-20 10:24:24 -07:00
parent 97255b42fb
commit 93f4e1feea
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.github/workflows/ci.yml vendored
View File

@ -28,8 +28,9 @@ jobs:
shell: bash shell: bash
run: | run: |
set -euo pipefail set -euo pipefail
# Use debug build for faster startup in CI # Start the already-built release binary to avoid rebuild delays
RUST_LOG=info cargo run -p socktop_agent -- -p 3000 & # Force TLS off for this probe
RUST_LOG=info SOCKTOP_ENABLE_SSL=0 ./target/release/socktop_agent -p 3000 > agent.log 2>&1 &
AGENT_PID=$! AGENT_PID=$!
echo "AGENT_PID=$AGENT_PID" >> $GITHUB_ENV echo "AGENT_PID=$AGENT_PID" >> $GITHUB_ENV
# Wait for port 3000 to accept connections (30s max) # Wait for port 3000 to accept connections (30s max)
@ -40,6 +41,13 @@ jobs:
fi fi
sleep 0.5 sleep 0.5
done done
if ! bash -lc "</dev/tcp/127.0.0.1/3000" &>/dev/null; then
echo "--- agent.log (tail) ---"
tail -n 200 agent.log || true
echo "--- lsof/netstat ---"
(command -v ss >/dev/null && ss -ltnp || netstat -ltnp) || true
exit 1
fi
- name: Run WS probe test (Ubuntu) - name: Run WS probe test (Ubuntu)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
shell: bash shell: bash
@ -57,14 +65,26 @@ jobs:
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
shell: pwsh shell: pwsh
run: | run: |
$p = Start-Process -FilePath "cargo" -ArgumentList "run -p socktop_agent -- -p 3000" -PassThru # Start the already-built release binary to avoid rebuild delays
# Force TLS off for this probe
$env:SOCKTOP_ENABLE_SSL = "0"
$out = Join-Path $PWD "agent.out.txt"
$err = Join-Path $PWD "agent.err.txt"
$p = Start-Process -FilePath "${PWD}\\target\\release\\socktop_agent.exe" -ArgumentList "-p 3000" -RedirectStandardOutput $out -RedirectStandardError $err -PassThru -NoNewWindow
echo "AGENT_PID=$($p.Id)" | Out-File -FilePath $env:GITHUB_ENV -Append echo "AGENT_PID=$($p.Id)" | Out-File -FilePath $env:GITHUB_ENV -Append
$ready = $false $ready = $false
for ($i = 0; $i -lt 60; $i++) { for ($i = 0; $i -lt 120; $i++) {
if (Test-NetConnection -ComputerName 127.0.0.1 -Port 3000 -InformationLevel Quiet) { $ready = $true; break } if (Test-NetConnection -ComputerName 127.0.0.1 -Port 3000 -InformationLevel Quiet) { $ready = $true; break }
Start-Sleep -Milliseconds 500 Start-Sleep -Milliseconds 500
} }
if (-not $ready) { Write-Error "agent did not become ready" } if (-not $ready) {
Write-Warning "TCP connect to (127.0.0.1 : 3000) failed"
if (Test-Path $out) { Write-Host "--- agent.out (tail) ---"; Get-Content $out -Tail 200 }
if (Test-Path $err) { Write-Host "--- agent.err (tail) ---"; Get-Content $err -Tail 200 }
Write-Host "--- netstat ---"
netstat -ano | Select-String ":3000" | ForEach-Object { $_.Line }
Write-Error "agent did not become ready"
}
- name: Run WS probe test (Windows) - name: Run WS probe test (Windows)
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
shell: pwsh shell: pwsh