Skip to content

Commit f973343

Browse files
committed
fix linux CI
1 parent a876e49 commit f973343

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -286,22 +286,20 @@ jobs:
286286
set -euo pipefail
287287
for IMAGE in ubuntu:22.04 ubuntu:24.04 debian:bookworm debian:trixie; do
288288
echo "\n=== ABI check in $IMAGE ==="
289-
docker run --rm -v "${GITHUB_WORKSPACE}:/ws" "$IMAGE" bash <<'EOF'
289+
docker run --rm -v "${GITHUB_WORKSPACE}:/ws" "$IMAGE" bash -lc '
290290
set -euo pipefail
291291
apt-get update >/dev/null
292292
apt-get install -y --no-install-recommends binutils >/dev/null
293-
294293
BIN=/ws/Builds/LinuxMakefile/build/${{ env.ProjectName }}
295-
MAX_GLIBC=$(objdump -T "$BIN" | grep -o 'GLIBC_[0-9.]\+' | sed 's/GLIBC_//' | sort -V | tail -1)
294+
MAX_GLIBC=$(objdump -T "$BIN" | grep -o "GLIBC_[0-9.]\\+" | sed "s/GLIBC_//" | sort -V | tail -1)
296295
echo "Max GLIBC symbol: $MAX_GLIBC"
297296
dpkg --compare-versions "$MAX_GLIBC" le "2.35"
298-
299-
NEEDED=$(readelf -d "$BIN" | awk '/NEEDED/ {print $5}' | tr -d '[]')
300-
if echo "$NEEDED" | grep -E 'libssl\.so\.1\.1|libcrypto\.so\.1\.1' >/dev/null; then
297+
NEEDED=$(readelf -d "$BIN" | awk "/NEEDED/ {print \\$5}" | tr -d "[]")
298+
if echo "$NEEDED" | grep -E "libssl\\.so\\.1\\.1|libcrypto\\.so\\.1\\.1" >/dev/null; then
301299
echo "OpenSSL 1.1 dependency detected"
302300
exit 1
303301
fi
304-
EOF
302+
'
305303
done
306304
307305
- name: Prepare AppImage Tool
@@ -337,12 +335,12 @@ jobs:
337335
fi
338336
}
339337
340-
cp -d $LIB_PATH/libmosquitto.so* $APPDIR/usr/lib/ || true
341-
cp -d $LIB_PATH/libmosquittopp.so* $APPDIR/usr/lib/ || true
342-
cp -d $LIB_PATH/libbluetooth.so* $APPDIR/usr/lib/ || true
343-
cp -d $LIB_PATH/libusb-1.0.so* $APPDIR/usr/lib/ || true
344-
cp -d $LIB_PATH/libhidapi-hidraw.so* $APPDIR/usr/lib/ || true
345-
cp -d $LIB_PATH/libSDL2-2.0.so* $APPDIR/usr/lib/ || true
338+
copy_glob "$LIB_PATH/libmosquitto.so*"
339+
copy_glob "$LIB_PATH/libmosquittopp.so*"
340+
copy_glob "$LIB_PATH/libbluetooth.so*"
341+
copy_glob "$LIB_PATH/libusb-1.0.so*"
342+
copy_glob "$LIB_PATH/libhidapi-hidraw.so*"
343+
copy_glob "$LIB_PATH/libSDL2-2.0.so*"
346344
copy_glob "External/servus/lib/linux/libServus.so*"
347345
348346
# Never bundle glibc/libstdc++/OpenSSL/libcurl

0 commit comments

Comments
 (0)