Skip to content

Commit 6716756

Browse files
committed
fix: glibc
1 parent 198f59c commit 6716756

1 file changed

Lines changed: 24 additions & 7 deletions

File tree

.github/workflows/e2e-test.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,15 @@ jobs:
5050
uses: dtolnay/rust-toolchain@master
5151
with:
5252
toolchain: ${{ vars.REQUIRED_RUSTC_VERSION }}
53+
targets: x86_64-unknown-linux-gnu
54+
55+
- name: Install Zig
56+
uses: mlugg/setup-zig@v1
57+
with:
58+
version: 0.13.0
59+
60+
- name: Install cargo-zigbuild
61+
run: cargo install --locked cargo-zigbuild
5362

5463
- name: Install system dependencies
5564
run: |
@@ -95,12 +104,20 @@ jobs:
95104
run: ./wireguard/build-wireguard-go.sh
96105

97106
- name: Build nym-vpnc, nym-vpnd and nym-socks5-proxy
98-
run: cargo build --release -p nym-vpnc -p nym-vpnd -p nym-socks5-proxy
107+
env:
108+
CFLAGS_x86_64_unknown_linux_gnu: -I/usr/include/x86_64-linux-gnu
109+
BINDGEN_EXTRA_CLANG_ARGS_x86_64_unknown_linux_gnu: -I/usr/include/x86_64-linux-gnu
110+
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: -L /usr/lib/x86_64-linux-gnu
111+
run: cargo zigbuild --release --target x86_64-unknown-linux-gnu.2.36 -p nym-vpnc -p nym-vpnd -p nym-socks5-proxy
99112
working-directory: nym-vpn-core
100113

101114
- name: Build test-manager, test-runner
115+
env:
116+
CFLAGS_x86_64_unknown_linux_gnu: -I/usr/include/x86_64-linux-gnu
117+
BINDGEN_EXTRA_CLANG_ARGS_x86_64_unknown_linux_gnu: -I/usr/include/x86_64-linux-gnu
118+
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: -L /usr/lib/x86_64-linux-gnu
102119
run: |
103-
cargo build --release \
120+
cargo zigbuild --release --target x86_64-unknown-linux-gnu.2.36 \
104121
-p test-manager -p test-runner
105122
working-directory: ${{ env.TEST_CRATE_DIR }}
106123

@@ -134,11 +151,11 @@ jobs:
134151
- name: Collect binaries
135152
run: |
136153
mkdir -p /tmp/dist
137-
cp nym-vpn-core/target/release/nym-vpnc /tmp/dist/
138-
cp nym-vpn-core/target/release/nym-vpnd /tmp/dist/
139-
cp nym-vpn-core/target/release/nym-socks5-proxy /tmp/dist/
140-
cp nym-vpn-core/target/release/test-manager /tmp/dist/
141-
cp nym-vpn-core/target/release/test-runner /tmp/dist/
154+
cp nym-vpn-core/target/x86_64-unknown-linux-gnu/release/nym-vpnc /tmp/dist/
155+
cp nym-vpn-core/target/x86_64-unknown-linux-gnu/release/nym-vpnd /tmp/dist/
156+
cp nym-vpn-core/target/x86_64-unknown-linux-gnu/release/nym-socks5-proxy /tmp/dist/
157+
cp nym-vpn-core/target/x86_64-unknown-linux-gnu/release/test-manager /tmp/dist/
158+
cp nym-vpn-core/target/x86_64-unknown-linux-gnu/release/test-runner /tmp/dist/
142159
143160
- name: Upload binaries
144161
uses: actions/upload-artifact@v7

0 commit comments

Comments
 (0)