diff --git a/.ci/build_packages/Dockerfile b/.ci/build_packages/Dockerfile index 792acddf5..6f9a12159 100644 --- a/.ci/build_packages/Dockerfile +++ b/.ci/build_packages/Dockerfile @@ -7,6 +7,8 @@ COPY . /emqx WORKDIR /emqx +RUN rm -rf _build/${EMQX_NAME}/lib _build/${EMQX_NAME}-pkg/lib + RUN make ${EMQX_NAME}-zip || cat rebar3.crashdump RUN make ${EMQX_NAME}-pkg || cat rebar3.crashdump diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index f6ccc3e75..d5feda5f2 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -149,9 +149,9 @@ running_test(){ } relup_test(){ - TARGET_VERSION="$1" + TARGET_VERSION="$("$CODE_PATH"/pkg-vsn.sh)" if [ -d "${RELUP_PACKAGE_PATH}" ];then - cd "${RELUP_PACKAGE_PATH }" + cd "${RELUP_PACKAGE_PATH}" for var in "${EMQX_NAME}"-*-"${ARCH}".zip;do packagename=$(basename "${var}") @@ -161,7 +161,7 @@ relup_test(){ ./emqx/bin/emqx versions cp "${PACKAGE_PATH}/${EMQX_NAME}"-*-"${TARGET_VERSION}-${ARCH}".zip ./emqx/releases ./emqx/bin/emqx install "${TARGET_VERSION}" - [ "$(./emqx/bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]")" = "${TARGET_VERSION}" ] || exit 1 + [ "$(./emqx/bin/emqx versions |grep permanent | awk '{print $2}')" = "${TARGET_VERSION}" ] || exit 1 ./emqx/bin/emqx_ctl status ./emqx/bin/emqx stop rm -rf emqx @@ -171,4 +171,4 @@ relup_test(){ emqx_prepare emqx_test -relup_test "$CODE_PATH"/pkg-vsn.sh +relup_test diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 1f6c102eb..3b2f6b27c 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -304,7 +304,7 @@ jobs: -f .ci/build_packages/Dockerfile \ --build-arg BUILD_FROM=emqx/build-env:$ERL_OTP-$SYSTEM \ --build-arg EMQX_NAME=$PROFILE \ - --output type=tar,dest=/tmp/cross-build-$PROFILE-for-$SYSTEM.tar . || df -h + --output type=tar,dest=/tmp/cross-build-$PROFILE-for-$SYSTEM.tar . mkdir -p /tmp/packages/$PROFILE tar -xvf /tmp/cross-build-$PROFILE-for-$SYSTEM.tar --wildcards emqx/_packages/$PROFILE/*