Skip to content

Commit cf0aaee

Browse files
committed
Fix slipstream CI: use vendored OpenSSL, drop arm64 (timeout), fix linker
1 parent 538368e commit cf0aaee

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

.github/workflows/release.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ jobs:
5555
strategy:
5656
matrix:
5757
include:
58-
- target: x86_64-unknown-linux-musl
58+
- target: x86_64-unknown-linux-gnu
5959
suffix: slipstream-client-linux-amd64
60-
- target: aarch64-unknown-linux-musl
61-
suffix: slipstream-client-linux-arm64
60+
deps: libssl-dev
6261
- target: x86_64-pc-windows-gnu
6362
suffix: slipstream-client-windows-amd64.exe
63+
deps: gcc-mingw-w64-x86-64
6464

6565
steps:
6666
- name: Checkout slipstream-rust
@@ -77,12 +77,16 @@ jobs:
7777
- name: Install cross-compile deps
7878
run: |
7979
sudo apt-get update -q
80-
sudo apt-get install -y musl-tools gcc-aarch64-linux-gnu gcc-mingw-w64-x86-64
80+
sudo apt-get install -y ${{ matrix.deps }}
8181
8282
- name: Build slipstream-client
8383
working-directory: slipstream-rust
84+
env:
85+
OPENSSL_STATIC: '1'
86+
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
87+
PKG_CONFIG_ALLOW_CROSS: '1'
8488
run: |
85-
cargo build --release --target ${{ matrix.target }} -p slipstream-client
89+
cargo build --release --target ${{ matrix.target }} -p slipstream-client --features openssl/vendored
8690
BIN=target/${{ matrix.target }}/release/slipstream-client
8791
[ -f "${BIN}.exe" ] && BIN="${BIN}.exe"
8892
cp "$BIN" ../${{ matrix.suffix }}

0 commit comments

Comments
 (0)