Skip to content

Commit fa35431

Browse files
committed
Fix Windows slipstream: use MSYS2 pacman for MinGW OpenSSL with .a libs
1 parent ac6a047 commit fa35431

1 file changed

Lines changed: 7 additions & 17 deletions

File tree

.github/workflows/release.yml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -98,41 +98,31 @@ jobs:
9898
targets: x86_64-pc-windows-gnu
9999

100100
- name: Install deps
101-
run: |
102-
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
103-
choco install pkgconfiglite -y
104-
choco install mingw -y
105-
106-
- name: Find OpenSSL
107-
id: openssl
108101
shell: bash
109102
run: |
110-
for d in "C:/Program Files/OpenSSL-Win64" "C:/Program Files/OpenSSL" "C:/OpenSSL-Win64" "C:/OpenSSL"; do
111-
if [ -f "$d/lib/libssl.a" ] || [ -f "$d/lib/ssl.lib" ] || [ -d "$d/include/openssl" ]; then
112-
echo "root=$d" >> $GITHUB_OUTPUT
113-
break
114-
fi
115-
done
103+
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
104+
# Install MinGW-native OpenSSL via MSYS2 (provides libcrypto.a / libssl.a for MinGW)
105+
C:/msys64/usr/bin/pacman -S --noconfirm mingw-w64-x86_64-openssl mingw-w64-x86_64-pkg-config
116106
117107
- name: Pre-build picoquic with bash (MinGW)
118108
shell: bash
119109
working-directory: slipstream-rust
120110
env:
121111
PICOQUIC_BUILD_DIR: ${{ github.workspace }}/slipstream-rust/.picoquic-build
122112
CMAKE_GENERATOR: MinGW Makefiles
123-
OPENSSL_ROOT_DIR: ${{ steps.openssl.outputs.root }}
113+
OPENSSL_ROOT_DIR: C:/msys64/mingw64
124114
run: |
125-
export PATH="/c/mingw64/bin:/c/Program Files/Git/usr/bin:$PATH"
115+
export PATH="/c/msys64/mingw64/bin:/c/mingw64/bin:$PATH"
126116
bash scripts/build_picoquic.sh
127117
128118
- name: Build slipstream-client
129119
shell: bash
130120
working-directory: slipstream-rust
131121
env:
132122
PICOQUIC_BUILD_DIR: ${{ github.workspace }}/slipstream-rust/.picoquic-build
133-
OPENSSL_ROOT_DIR: ${{ steps.openssl.outputs.root }}
123+
OPENSSL_ROOT_DIR: C:/msys64/mingw64
134124
run: |
135-
export PATH="/c/mingw64/bin:/c/Program Files/Git/usr/bin:$PATH"
125+
export PATH="/c/msys64/mingw64/bin:/c/mingw64/bin:$PATH"
136126
cargo build --release -p slipstream-client --target x86_64-pc-windows-gnu --features slipstream-ffi/openssl-vendored
137127
cp target/x86_64-pc-windows-gnu/release/slipstream-client.exe ../slipstream-client-windows-amd64.exe
138128

0 commit comments

Comments
 (0)