File tree Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Original file line number Diff line number Diff 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)
121122echo " 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
125130if [[ ! -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)
127132fi
128133
129134if [ ` echo " $BAD_BINS " | wc -w` -ne 0 ]; then
You can’t perform that action at this time.
0 commit comments