Skip to content

Commit e17ceac

Browse files
update Cross.toml and debug in build.yaml
1 parent 2bb0676 commit e17ceac

File tree

2 files changed

+23
-26
lines changed

2 files changed

+23
-26
lines changed

.github/workflows/build.yaml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -206,36 +206,29 @@ jobs:
206206
exit 1
207207
fi
208208
209-
- name: Build with Kafka (cross)
209+
- name: Build with Kafka (cross) - DEBUG
210210
if: matrix.use_cross
211211
env:
212212
LIBRDKAFKA_SSL_VENDORED: "1"
213213
PKG_CONFIG_ALLOW_CROSS: "1"
214214
CROSS_NO_WARNINGS: "0"
215215
RUST_BACKTRACE: "1"
216216

217-
# Zlib hints for CMake (explicit include/lib, no ZLIB_ROOT)
218-
ZLIB_INCLUDE_DIR: "/usr/include/aarch64-linux-gnu"
217+
# Will be updated based on Cross.toml pre-build output
218+
ZLIB_INCLUDE_DIR: "/usr/include"
219219
ZLIB_LIBRARY: "/usr/lib/aarch64-linux-gnu/libz.so"
220220

221-
# OpenSSL hints
222221
OPENSSL_ROOT_DIR: "/usr"
223-
OPENSSL_INCLUDE_DIR: "/usr/include/aarch64-linux-gnu"
222+
OPENSSL_INCLUDE_DIR: "/usr/include"
224223
OPENSSL_CRYPTO_LIBRARY: "/usr/lib/aarch64-linux-gnu/libcrypto.so"
225224
OPENSSL_SSL_LIBRARY: "/usr/lib/aarch64-linux-gnu/libssl.so"
226225

227226
PKG_CONFIG_PATH: "/usr/lib/aarch64-linux-gnu/pkgconfig"
228227
run: |
229-
echo "ZLIB_INCLUDE_DIR=$ZLIB_INCLUDE_DIR"
230-
echo "ZLIB_LIBRARY=$ZLIB_LIBRARY"
231-
ls -l /usr/include/aarch64-linux-gnu || true
232-
ls -l /usr/lib/aarch64-linux-gnu/libz* || true
228+
echo "=== HOST ENV DEBUG ==="
229+
env | grep -E 'ZLIB_|OPENSSL_|PKG_CONFIG|LIBRDKAFKA'
230+
echo "=== HOST PATHS DEBUG ==="
231+
ls -la /usr/include/aarch64-linux-gnu 2>/dev/null || echo "No host /usr/include/aarch64-linux-gnu"
232+
ls -la /usr/lib/aarch64-linux-gnu 2>/dev/null || echo "No host /usr/lib/aarch64-linux-gnu"
233+
echo "=== CROSS BUILD START ==="
233234
cross build --target ${{ matrix.target }} --features kafka --release --verbose
234-
235-
- name: Build with Kafka (native)
236-
if: ${{ !matrix.use_cross }}
237-
env:
238-
CC: ${{ runner.os == 'Linux' && 'gcc-11' || '' }}
239-
CXX: ${{ runner.os == 'Linux' && 'g++-11' || '' }}
240-
LIBRDKAFKA_SSL_VENDORED: "1"
241-
run: cargo build --target ${{ matrix.target }} --features kafka --release

Cross.toml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22
image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu@sha256:1e2a0291f92a4372cbc22d8994e735473045383f1ce7fa44a16c234ba00187f4"
33
pre-build = [
44
"dpkg --add-architecture arm64",
5-
"apt-get update || true",
6-
"apt-get install -y pkg-config:arm64 zlib1g-dev:arm64 libssl-dev:arm64 libsasl2-dev:arm64 libzstd-dev:arm64 liblz4-dev:arm64 || true",
7-
# debug to confirm libs/headers are present
8-
"ls -R /usr/lib/aarch64-linux-gnu || true",
9-
"ls -R /usr/include/aarch64-linux-gnu || true",
5+
"apt-get update",
6+
"apt-get install -y pkg-config:arm64 zlib1g-dev:arm64 libssl-dev:arm64 libsasl2-dev:arm64 libzstd-dev:arm64 liblz4-dev:arm64",
7+
"echo '=== DEBUG: zlib installation paths ==='",
8+
"dpkg -l | grep zlib || true",
9+
"find /usr -name 'zlib.h' 2>/dev/null || true",
10+
"find /usr -name 'libz.so*' 2>/dev/null || true",
11+
"pkg-config --cflags --libs zlib || echo 'pkg-config zlib failed'",
12+
"echo '=== DEBUG: aarch64-linux-gnu paths ==='",
13+
"ls -la /usr/include/aarch64-linux-gnu 2>/dev/null || echo 'No /usr/include/aarch64-linux-gnu'",
14+
"ls -la /usr/lib/aarch64-linux-gnu 2>/dev/null || echo 'No /usr/lib/aarch64-linux-gnu'",
1015
]
1116

1217
[target.aarch64-unknown-linux-gnu.env]
@@ -15,19 +20,18 @@ passthrough = [
1520
"PKG_CONFIG_ALLOW_CROSS",
1621
"CROSS_NO_WARNINGS",
1722
"RUST_BACKTRACE",
18-
# Explicit Zlib hints (used by CMake FindZLIB)
1923
"ZLIB_INCLUDE_DIR",
2024
"ZLIB_LIBRARY",
21-
# OpenSSL hints
2225
"OPENSSL_ROOT_DIR",
2326
"OPENSSL_INCLUDE_DIR",
2427
"OPENSSL_CRYPTO_LIBRARY",
2528
"OPENSSL_SSL_LIBRARY",
2629
"PKG_CONFIG_PATH",
2730
]
31+
# Fixed volumes syntax - mount host aarch64 paths into container
2832
volumes = [
29-
"/usr/lib/aarch64-linux-gnu:/usr/lib/aarch64-linux-gnu:ro",
30-
"/usr/include/aarch64-linux-gnu:/usr/include/aarch64-linux-gnu:ro",
33+
"ZLIB_HOST_INCLUDE=/usr/include/aarch64-linux-gnu",
34+
"ZLIB_HOST_LIB=/usr/lib/aarch64-linux-gnu",
3135
]
3236

3337
[target.x86_64-unknown-linux-gnu]

0 commit comments

Comments
 (0)