From 38447ff187b33760606f2d2c7a626a508000dd3d Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 31 Mar 2022 10:10:12 +0200 Subject: [PATCH 1/2] chore(appup): fix update-appup.sh git reset before clean --- scripts/update-appup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/update-appup.sh b/scripts/update-appup.sh index d5f3b5407..d62faee74 100755 --- a/scripts/update-appup.sh +++ b/scripts/update-appup.sh @@ -93,6 +93,7 @@ if [ "$NEW_COPY" = 'no' ]; then REMOTE="$(git remote -v | grep "${GIT_REPO}" | head -1 | awk '{print $1}')" git fetch "$REMOTE" fi +git reset --hard git clean -fdx git checkout "${PREV_TAG}" make "$PROFILE" From b9c02bff1e02712a85350fc279d4fb6e195715ca Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 31 Mar 2022 10:39:30 +0200 Subject: [PATCH 2/2] ci: delete yum install openssl11 in test --- .ci/build_packages/tests.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index 01fdc07dc..b74d61ff2 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -89,11 +89,6 @@ emqx_test(){ "rpm") packagename=$(basename "${PACKAGE_PATH}/${EMQX_NAME}"-*.rpm) - if [[ "${ARCH}" == "amd64" && $(rpm -E '%{rhel}') == 7 ]] ; then - # EMQX OTP requires openssl11 to have TLS1.3 support - yum install -y openssl11 - fi - rpm -ivh "${PACKAGE_PATH}/${packagename}" if ! rpm -q emqx | grep -q emqx; then echo "package install error"