Merge branch 'main-v4.3' of https://github.com/emqx/emqx into re_source_test

.github/workflows/apps_version_check.yaml

@@ -16,12 +16,14 @@ jobs:
     container: emqx/build-env:${{ matrix.erl_otp }}-${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
-      - name: Check apps version
+        with:
-        run: ./scripts/apps-version-check.sh
+          fetch-depth: 0 # need full history
       - name: Check relup (ce)
         if: endsWith(github.repository, 'emqx')
         run: ./scripts/update-appup.sh emqx --check
       - name: Check relup (ee)
         if: endsWith(github.repository, 'enterprise')
         run: ./scripts/update-appup.sh emqx-ee --check
+      - name: Check apps version
+        run: ./scripts/apps-version-check.sh

include/emqx_release.hrl

@@ -29,7 +29,7 @@
 
 -ifndef(EMQX_ENTERPRISE).
 
--define(EMQX_RELEASE, {opensource, "4.3.13-rc.1"}).
+-define(EMQX_RELEASE, {opensource, "4.3.13-rc.2"}).
 
 -else.
 

scripts/apps-version-check.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-latest_release=$(git describe --abbrev=0 --tags)
+latest_release=$(git describe --abbrev=0 --tags --exclude '*rc*' --exclude '*alpha*' --exclude '*beta*')
 
 bad_app_count=0
 

scripts/get-dashboard.sh

@@ -8,8 +8,8 @@ cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
 PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
 case "${PKG_VSN}" in
     4.3*)
-        EMQX_CE_DASHBOARD_VERSION='v4.3.5'
+        EMQX_CE_DASHBOARD_VERSION='v4.3.6'
-        EMQX_EE_DASHBOARD_VERSION='v4.3.15'
+        EMQX_EE_DASHBOARD_VERSION='v4.3.16'
         ;;
     *)
         echo "Unsupported version $PKG_VSN" >&2

scripts/update-appup.sh

@@ -16,15 +16,15 @@ cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
 PROFILE="${1:-}"
 case "$PROFILE" in
     emqx-ee)
-        DIR='enterprise'
+        GIT_REPO='emqx/emqx-enterprise.git'
         TAG_PREFIX='e'
         ;;
     emqx)
-        DIR='broker'
+        GIT_REPO='emqx/emqx.git'
         TAG_PREFIX='v'
         ;;
     emqx-edge)
-        DIR='edge'
+        GIT_REPO='emqx/emqx.git'
         TAG_PREFIX='v'
         ;;
     *)
@@ -34,8 +34,12 @@ case "$PROFILE" in
         ;;
 esac
 
-PREV_TAG="$(git describe --tag --match "${TAG_PREFIX}*" | grep -oE "${TAG_PREFIX}4\.[0-9]+\.[0-9]+")"
+## possible tags:
-PREV_VERSION="${PREV_TAG#[e|v]}"
+##  v4.3.11
+##  e4.3.11
+##  rel-v4.4.3
+##  rel-e4.4.3
+PREV_TAG="${PREV_TAG:-$(git describe --tag --abbrev=0 --match "[${TAG_PREFIX}|rel-]*" --exclude '*rc*' --exclude '*alpha*' --exclude '*beta*')}"
 
 shift 1
 # bash 3.2 treat empty array as unbound, so we can't use 'ESCRIPT_ARGS=()' here,
@@ -74,46 +78,37 @@ if [ "${SKIP_BUILD:-}" != 'yes' ]; then
     make "${PROFILE}"
 fi
 
-SYSTEM="${SYSTEM:-$(./scripts/get-distro.sh)}"
+PREV_DIR_BASE="/tmp/_w"
-if [ -z "${ARCH:-}" ]; then
-    UNAME="$(uname -m)"
-    case "$UNAME" in
-        x86_64)
-            ARCH='amd64'
-            ;;
-        aarch64)
-            ARCH='arm64'
-            ;;
-        arm*)
-            ARCH='arm'
-            ;;
-    esac
-fi
-
-PACKAGE_NAME="${PROFILE}-${SYSTEM}-${PREV_VERSION}-${ARCH}.zip"
-DOWNLOAD_URL="https://www.emqx.com/downloads/${DIR}/v${PREV_VERSION}/${PACKAGE_NAME}"
-
-PREV_DIR_BASE="/tmp/emqx-appup-base"
 mkdir -p "${PREV_DIR_BASE}"
-pushd "${PREV_DIR_BASE}"
+if [ ! -d "${PREV_DIR_BASE}/${PREV_TAG}" ]; then
-if [ ! -f "${PACKAGE_NAME}" ]; then
+    cp -R . "${PREV_DIR_BASE}/${PREV_TAG}"
-    echo "Download: ${PACKAGE_NAME}"
+    # always 'yes' in CI
-    curl -f -L -o "${PACKAGE_NAME}" "${DOWNLOAD_URL}"
+    NEW_COPY='yes'
+else
+    NEW_COPY='no'
 fi
-if [ ! -d "${PREV_TAG}"  ]; then
+
-    unzip -q -n -d "${PREV_TAG}" "${PACKAGE_NAME}"
+pushd "${PREV_DIR_BASE}/${PREV_TAG}"
+if [ "$NEW_COPY" = 'no' ]; then
+    REMOTE="$(git remote -v | grep "${GIT_REPO}" | head -1 | awk '{print $1}')"
+    git fetch "$REMOTE"
 fi
+git clean -fdx
+git checkout "${PREV_TAG}"
+make "$PROFILE"
 popd
 
+PREV_REL_DIR="${PREV_DIR_BASE}/${PREV_TAG}/_build/${PROFILE}/lib"
+
 # bash 3.2 does not allow empty array, so we had to add an empty string in the ESCRIPT_ARGS array,
 # this in turn makes quoting "${ESCRIPT_ARGS[@]}" problematic, hence disable SC2068 check here
 # shellcheck disable=SC2068
 ./scripts/update_appup.escript \
     --src-dirs "${SRC_DIRS}/**" \
     --release-dir "_build/${PROFILE}/lib" \
-    --prev-release-dir "${PREV_DIR_BASE}/${PREV_TAG}/emqx/lib" \
+    --prev-release-dir "${PREV_REL_DIR}" \
     --skip-build \
-    ${ESCRIPT_ARGS[@]} "$PREV_VERSION"
+    ${ESCRIPT_ARGS[@]} "$PREV_TAG"
 
 if [ "${IS_CHECK:-}" = 'yes' ]; then
     diffs="$(git diff --name-only | grep -E '\.appup\.src' || true)"