Skip to content

Commit

Permalink
Problem: Sync with zproject (Android build failures when <dependency>…
Browse files Browse the repository at this point in the history
…_ROOT is specified)

Solution: Regenerate ZYRE with this commit.
  • Loading branch information
stephan57160 committed Oct 18, 2022
1 parent 2c520f2 commit 326f9bb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions bindings/jni/ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ if [ -d "${LIBZMQ_ROOT}" ] ; then
echo "ZYRE - Cleaning LIBZMQ folder '${LIBZMQ_ROOT}' ..."
( cd "${LIBZMQ_ROOT}" && ( make clean || : ))
else
mkdir -p "$(dirname "${LIBZMQ_ROOT}")"
echo "ZYRE - Cloning 'https://github.com/zeromq/libzmq.git' (default branch) under '${LIBZMQ_ROOT}' ..."
$CI_TIME git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git $LIBZMQ_ROOT
fi
Expand Down Expand Up @@ -85,6 +86,7 @@ if [ -d "${CZMQ_ROOT}" ] ; then
echo "ZYRE - Cleaning LIBCZMQ folder '${CZMQ_ROOT}' ..."
( cd "${CZMQ_ROOT}" && ( make clean || : ))
else
mkdir -p "$(dirname "${CZMQ_ROOT}")"
echo "ZYRE - Cloning 'https://github.com/zeromq/czmq.git' (default branch) under '${CZMQ_ROOT}' ..."
$CI_TIME git clone --quiet --depth 1 https://github.com/zeromq/czmq.git $CZMQ_ROOT
fi
Expand Down
2 changes: 2 additions & 0 deletions builds/android/ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ if [ -d "${LIBZMQ_ROOT}" ] ; then
echo "ZYRE - Cleaning LIBZMQ folder '${LIBZMQ_ROOT}' ..."
( cd "${LIBZMQ_ROOT}" && ( make clean || : ))
else
mkdir -p "$(dirname "${LIBZMQ_ROOT}")"
echo "ZYRE - Cloning 'https://github.com/zeromq/libzmq.git' (default branch) under '${LIBZMQ_ROOT}' ..."
git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git "${LIBZMQ_ROOT}"
( cd ${LIBZMQ_ROOT} && git log --oneline -n 1 )
Expand All @@ -51,6 +52,7 @@ if [ -d "${CZMQ_ROOT}" ] ; then
echo "ZYRE - Cleaning LIBCZMQ folder '${CZMQ_ROOT}' ..."
( cd "${CZMQ_ROOT}" && ( make clean || : ))
else
mkdir -p "$(dirname "${CZMQ_ROOT}")"
echo "ZYRE - Cloning 'https://github.com/zeromq/czmq.git' (default branch) under '${CZMQ_ROOT}' ..."
git clone --quiet --depth 1 https://github.com/zeromq/czmq.git "${CZMQ_ROOT}"
( cd ${CZMQ_ROOT} && git log --oneline -n 1 )
Expand Down

0 comments on commit 326f9bb

Please sign in to comment.