Bläddra i källkod

Merge pull request #9804 from emqx/release-50

Merge release-50 (candidate of e5.0.0-rc.1) back to master.
Zaiming (Stone) Shi 3 år sedan
förälder
incheckning
63748aba3c
2 ändrade filer med 21 tillägg och 3 borttagningar
  1. 1 1
      apps/emqx/include/emqx_release.hrl
  2. 20 2
      scripts/rel/cut.sh

+ 1 - 1
apps/emqx/include/emqx_release.hrl

@@ -35,7 +35,7 @@
 -define(EMQX_RELEASE_CE, "5.0.14").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.0.0-beta.6").
+-define(EMQX_RELEASE_EE, "5.0.0-rc.1").
 
 %% the HTTP API version
 -define(EMQX_API_VERSION, "5.0").

+ 20 - 2
scripts/rel/cut.sh

@@ -53,7 +53,8 @@ case "$TAG" in
     e*)
         TAG_PREFIX='e'
         PROFILE='emqx-enterprise'
-        SKIP_APPUP='no'
+        #TODO change to no when we are ready to support hot-upgrade
+        SKIP_APPUP='yes'
         ;;
     -h|--help)
         usage
@@ -217,7 +218,24 @@ generate_changelog () {
 if [ "$DRYRUN" = 'yes' ]; then
     logmsg "Release tag is ready to be created with command: git tag $TAG"
 else
-    generate_changelog
+    case "$TAG" in
+        *rc*)
+            true
+            ;;
+        *alpha*)
+            true
+            ;;
+        *beta*)
+            true
+            ;;
+        e5.0.0*)
+            # the first release has no change log
+            true
+            ;;
+        *)
+            generate_changelog
+            ;;
+    esac
     git tag "$TAG"
     logmsg "$TAG is created OK."
 fi