Merge branch 'stable'

Author: bugy

src/migrations/migrate.py

@@ -259,8 +259,11 @@ def __introduce_access_config(context):
         for i in range(len(output_files)):
             output_file = output_files[i]
 
+            if not isinstance(output_file, str):
+                continue
+
             for param_name in parameter_names:
-                output_file = re.sub('\$\$\$' + param_name, '${' + param_name + '}', output_file)
+                output_file = re.sub('\\$\\$\\$' + param_name, '${' + param_name + '}', output_file)
 
             if output_file != output_files[i]:
                 output_files[i] = output_file

tools/build.py

@@ -68,7 +68,7 @@ def create_version_file():
 
     npm_version = get_npm_version()
     if current_branch == 'stable':
-        last_tag = process_utils.invoke('git describe --abbrev=0 --tags').strip()
+        last_tag = process_utils.invoke('git describe --exclude dev --abbrev=0 --tags').strip()
         last_tag_version = parse_semver_str(last_tag)
         if (last_tag_version[0] == npm_version[0]) and (last_tag_version[1] == npm_version[1]):
             new_version = [last_tag_version[0], last_tag_version[1], last_tag_version[2] + 1]