diff --git a/CHANGELOG.md b/CHANGELOG.md index 765ba9c262..866c6f71d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +- v1.5.0(2023-07-16) + - 新增 清空操作日志 + - 修复 Python2证书查询失败问题 + - 新增 数据管理功能 + - 优化 文档新增k8s自动获取到ingress的域名到domain-admin + - 优化 添加py2兼容性备注 + - v1.4.36(2023-07-14) - 优化 自动写入CHANGELOG diff --git a/domain_admin/version.py b/domain_admin/version.py index d58e9f77b1..fc74d31b5c 100755 --- a/domain_admin/version.py +++ b/domain_admin/version.py @@ -7,4 +7,4 @@ """ from __future__ import print_function, unicode_literals, absolute_import, division -VERSION = '1.4.36' +VERSION = '1.5.0' diff --git a/version-cli/auto_release.py b/version-cli/auto_release.py index 3d3f397ac7..a96788c2c8 100644 --- a/version-cli/auto_release.py +++ b/version-cli/auto_release.py @@ -108,6 +108,14 @@ def get_changelog(version, next_version): return changelog +def release(next_version): + # 提交代码 + os.system( + "git add . && git commit -m 'release v{}' && git tag v{} && git push --tag".format( + next_version, next_version) + ) + + def main(): source_text = read_file(VERSION_FILE) @@ -122,11 +130,7 @@ def main(): write_file(VERSION_FILE, target_text) print(current_version, '=>', next_version) - # 提交代码 - os.system( - "git add . && git commit -m 'release v{}' && git tag v{} && git push --tag".format( - next_version, next_version) - ) + release(next_version) if __name__ == '__main__':