From 345ac209fd40d90a779f3eff4d8f4dfd1393461c Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Sat, 14 Nov 2026 23:38:03 +0800 Subject: [PATCH] fix: repair platform dependency and Windows CI inputs --- .github/workflows/publish-update-feeds.yaml | 4 ---- Cargo.lock | 11 +++++++++++ apps/gpservice/Cargo.toml | 6 ++++++ scripts/build-openconnect-windows.ps1 | 5 +++-- scripts/build-openconnect-windows.sh | 5 +++-- scripts/test-openconnect-windows.ps1 | 5 +++-- scripts/test-openconnect-windows.sh | 3 ++- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.github/workflows/publish-update-feeds.yaml b/.github/workflows/publish-update-feeds.yaml index 3db9a15..f94f171 100644 --- a/.github/workflows/publish-update-feeds.yaml +++ b/.github/workflows/publish-update-feeds.yaml @@ -560,10 +560,6 @@ jobs: CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} run: | - python3 scripts/preserve-update-feeds.py \ - --base-url "${FEED_URL%/appcast.xml}" \ - --directory gpgui/apps/update-feed-worker/public \ - --exclude appcast.xml --exclude latest.json trap 'status=$?; if [ "$status" -ne 0 ]; then echo "::error::Private operation failed; diagnostics suppressed."; fi' EXIT ( set -euo pipefail diff --git a/Cargo.lock b/Cargo.lock index e48e730..a490857 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2299,6 +2299,7 @@ dependencies = [ "gptunnel", "gpvpnc", "log", + "mac_address", "nix", "openconnect", "openssl", @@ -3258,6 +3259,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3d25b0e0b648a86960ac23b7ad4abb9717601dec6f66c165f5b037f3f03065f" +[[package]] +name = "mac_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0581a75c45969c63afd2bb87b1d8b25cfcc556c7a918cf9bb13b0fe8d2381" +dependencies = [ + "nix", + "windows-sys 0.61.2", +] + [[package]] name = "macro-string" version = "0.3.0" diff --git a/apps/gpservice/Cargo.toml b/apps/gpservice/Cargo.toml index fb9acc6..6a9c5db 100644 --- a/apps/gpservice/Cargo.toml +++ b/apps/gpservice/Cargo.toml @@ -34,6 +34,12 @@ getrandom = "0.4" [target.'cfg(unix)'.dependencies] nix = { version = "0.31", features = ["fs", "socket", "user"] } +[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))'.dependencies] +mac_address = "1.2.1" + +[target.'cfg(unix)'.dev-dependencies] +mac_address = "1.2.1" + [dev-dependencies] openssl.workspace = true tokio-tungstenite.workspace = true diff --git a/scripts/build-openconnect-windows.ps1 b/scripts/build-openconnect-windows.ps1 index 78d9714..d9e531e 100644 --- a/scripts/build-openconnect-windows.ps1 +++ b/scripts/build-openconnect-windows.ps1 @@ -3,6 +3,7 @@ [CmdletBinding()] param( [string]$MsysRoot = 'C:\msys64', + [ValidateSet('mingw64','ucrt64')][string]$MsysSubsystem = 'mingw64', [string]$Prefix, [int]$Jobs = 4 ) @@ -13,7 +14,7 @@ $Prefix = [System.IO.Path]::GetFullPath($Prefix) $bash = Join-Path $MsysRoot 'usr\bin\bash.exe' if (!(Test-Path $bash)) { throw 'MSYS2 is required to build OpenConnect.' } $ErrorActionPreference = 'Continue' -& $bash "$PSScriptRoot/build-openconnect-windows.sh" $repo $Prefix $Jobs +& $bash "$PSScriptRoot/build-openconnect-windows.sh" $repo $Prefix $Jobs $MsysSubsystem $nativeExit = $LASTEXITCODE $ErrorActionPreference = 'Stop' if ($nativeExit -ne 0) { throw 'OpenConnect compilation failed.' } @@ -49,7 +50,7 @@ while ($pending.Count) { foreach ($line in $dependencies) { if ($line -notmatch '^\s+(\S+\.dll)\s*$') { continue } $name = $Matches[1] - $source = Join-Path "$MsysRoot\mingw64\bin" $name + $source = Join-Path "$MsysRoot\$MsysSubsystem\bin" $name if (Test-Path $source) { $target = Join-Path "$Prefix\bin" $name Copy-Item $source $target -Force diff --git a/scripts/build-openconnect-windows.sh b/scripts/build-openconnect-windows.sh index a8aa539..0028e05 100644 --- a/scripts/build-openconnect-windows.sh +++ b/scripts/build-openconnect-windows.sh @@ -1,11 +1,12 @@ #!/usr/bin/env bash # Build the bundled protocol library with MSYS2's native Windows compiler. set -euo pipefail -export PATH="/mingw64/bin:/usr/bin:$PATH" +subsystem=$4 +export PATH="/$subsystem/bin:/usr/bin:$PATH" repo=$(cygpath -u "$1") prefix=$(cygpath -u "$2") jobs=$3 -export ACLOCAL_PATH=/mingw64/share/aclocal +export ACLOCAL_PATH="/$subsystem/share/aclocal" source_dir="$repo/crates/openconnect/deps/openconnect" build_dir="$repo/target/openconnect-windows" cd "$source_dir" diff --git a/scripts/test-openconnect-windows.ps1 b/scripts/test-openconnect-windows.ps1 index f94c5ac..15fae33 100644 --- a/scripts/test-openconnect-windows.ps1 +++ b/scripts/test-openconnect-windows.ps1 @@ -1,6 +1,7 @@ [CmdletBinding()] -param([string]$MsysRoot = 'C:\msys64', [string]$Prefix = $env:OPENCONNECT_WINDOWS_PREFIX) +param([string]$MsysRoot = 'C:\msys64', [string]$Prefix = $env:OPENCONNECT_WINDOWS_PREFIX, + [ValidateSet('mingw64','ucrt64')][string]$MsysSubsystem = 'mingw64') $repo = Split-Path $PSScriptRoot -Parent if (!$Prefix) { $Prefix = Join-Path $repo 'target\native-windows' } -& "$MsysRoot\usr\bin\bash.exe" "$PSScriptRoot/test-openconnect-windows.sh" $repo $Prefix +& "$MsysRoot\usr\bin\bash.exe" "$PSScriptRoot/test-openconnect-windows.sh" $repo $Prefix $MsysSubsystem if ($LASTEXITCODE -ne 0) { throw 'Native OpenConnect packet-pipe tests failed.' } diff --git a/scripts/test-openconnect-windows.sh b/scripts/test-openconnect-windows.sh index 752d128..4c628c9 100644 --- a/scripts/test-openconnect-windows.sh +++ b/scripts/test-openconnect-windows.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash # Run the native packet-pipe regression against the bundled Windows DLL. set -euo pipefail -export PATH="/mingw64/bin:/usr/bin:$PATH" +subsystem=$3 +export PATH="/$subsystem/bin:/usr/bin:$PATH" repo=$(cygpath -u "$1") prefix=$(cygpath -u "$2") build_dir="$repo/target/openconnect-windows"