yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci(jq): temp fix for ACLOCAL paths

This commit is contained in:
Zaiming (Stone) Shi 2022-05-16 07:49:16 +02:00
parent 3524fb6994
commit 4664a9fc53
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/buildx.sh
View File

@ -138,8 +138,8 @@ elif [[ $(uname -m) == "armv7l" && "$ARCH" == "arm64" ]]; then
IS_NATIVE_ARCH='yes' IS_NATIVE_ARCH='yes'
fi fi
if [[ "${IS_NATIVE_SYSTEM}" == 'yes' && "${IS_NATIVE_ARCH}" == 'yes' ]]; then if [[ "${IS_NATIVE_SYSTEM}" == 'yes' && "${IS_NATIVE_ARCH}" == 'yes' ]]; then
export ACLOCAL_PATH="/usr/share/aclocal:/usr/local/share/aclocal"
eval "$CMD_RUN" eval "$CMD_RUN"
elif docker info; then elif docker info; then
if [[ "${IS_NATIVE_ARCH}" == 'no' ]]; then if [[ "${IS_NATIVE_ARCH}" == 'no' ]]; then
@ -149,6 +149,7 @@ elif docker info; then
-v "$(pwd)":/emqx \ -v "$(pwd)":/emqx \
--workdir /emqx \ --workdir /emqx \
--platform="linux/$ARCH" \ --platform="linux/$ARCH" \
--env ACLOCAL_PATH="/usr/share/aclocal:/usr/local/share/aclocal" \
"$BUILDER" \ "$BUILDER" \
bash -euc "$CMD_RUN" bash -euc "$CMD_RUN"
else else