Skip to content

Commit be483ff

Browse files
committed
Fix cross-arch build dep binaries sanity check
1 parent f7d6f16 commit be483ff

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

build-release.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,19 @@ NATIVE_BINARIES=$(
116116
find ./tmp/$TARGET/ \
117117
-name '*.node' \
118118
-type f \
119-
-exec file {} \;
119+
-exec file {} \; \
120+
| sed "s#^./tmp/$TARGET/##" # Don't match the build targets's own path name!
120121
)
121122
echo "NATIVE BINS: $NATIVE_BINARIES"
122123

123-
BAD_BINS=$(echo "$NATIVE_BINARIES" | grep -vE "$EXPECTED_PLATFORM_STRING" | grep -vE "$EXPECTED_ARCH_STRING" || true)
124+
BAD_PLATFORM_BINS=$(echo "$NATIVE_BINARIES" | grep -v "$EXPECTED_PLATFORM_STRING" || true)
125+
BAD_ARCH_BINS=$(echo "$NATIVE_BINARIES" | grep -vE "$EXPECTED_ARCH_STRING" || true)
126+
127+
BAD_BINS="$BAD_PLATFORM_BINS
128+
$BAD_ARCH_BINS"
124129

125130
if [[ ! -z "$PACKAGE_WHITELIST" ]]; then
126-
BAD_BINS=$(echo "$BAD_BINS" | grep -E -v "$PACKAGE_WHITELIST" || true)
131+
BAD_BINS=$(echo "$BAD_BINS" | grep -vE "$PACKAGE_WHITELIST" || true)
127132
fi
128133

129134
if [ `echo "$BAD_BINS" | wc -w` -ne 0 ]; then

0 commit comments

Comments
 (0)