Skip to content

Commit cf74678

Browse files
committed
Fix Windows slipstream: use MinGW generator + x86_64-pc-windows-gnu target
1 parent 7b9042c commit cf74678

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/release.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,29 +94,34 @@ jobs:
9494

9595
- name: Install Rust
9696
uses: dtolnay/rust-toolchain@stable
97+
with:
98+
targets: x86_64-pc-windows-gnu
9799

98100
- name: Install deps
99101
run: |
100102
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
101103
choco install pkgconfiglite -y
104+
choco install mingw -y
102105
103-
- name: Pre-build picoquic with bash
106+
- name: Pre-build picoquic with bash (MinGW)
104107
shell: bash
105108
working-directory: slipstream-rust
106109
env:
107110
PICOQUIC_BUILD_DIR: ${{ github.workspace }}/slipstream-rust/.picoquic-build
108-
OPENSSL_ROOT_DIR: C:/Program Files/OpenSSL
109-
run: bash scripts/build_picoquic.sh
111+
CMAKE_GENERATOR: MinGW Makefiles
112+
run: |
113+
export PATH="/c/Program Files/Git/usr/bin:$PATH"
114+
bash scripts/build_picoquic.sh
110115
111116
- name: Build slipstream-client
112117
shell: bash
113118
working-directory: slipstream-rust
114119
env:
115120
PICOQUIC_BUILD_DIR: ${{ github.workspace }}/slipstream-rust/.picoquic-build
116-
OPENSSL_ROOT_DIR: C:/Program Files/OpenSSL
117121
run: |
118-
cargo build --release -p slipstream-client --features slipstream-ffi/openssl-vendored
119-
cp target/release/slipstream-client.exe ../slipstream-client-windows-amd64.exe
122+
export PATH="/c/Program Files/Git/usr/bin:$PATH"
123+
cargo build --release -p slipstream-client --target x86_64-pc-windows-gnu --features slipstream-ffi/openssl-vendored
124+
cp target/x86_64-pc-windows-gnu/release/slipstream-client.exe ../slipstream-client-windows-amd64.exe
120125
121126
- name: Upload artifact
122127
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)