accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-23 15:08:24 +00:00
Code Issues Releases Activity

Merge pull request #818 from sahil28297/new_release

Browse Source 
fix(release): Accomodate release for multiple branches
This commit is contained in:
Saurabh 2019-07-22 15:04:54 +05:30 committed by GitHub
commit acf51d6d81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bench/release.py
View File

@ -15,13 +15,16 @@ import click
branches_to_update = {
'develop': [],
'hotfix': ['develop']
'version-11-hotfix': [],
'version-12-hotfix': [],
}
releasable_branches = ['master']
github_username = None
github_password = None
def release(bench_path, app, bump_type, from_branch='develop', to_branch='master',
def release(bench_path, app, bump_type, from_branch, to_branch,
remote='upstream', owner='frappe', repo_name=None, frontport=True):
confirm_testing()
@ -30,11 +33,14 @@ def release(bench_path, app, bump_type, from_branch='develop', to_branch='master
if not config.get('release_bench'):
print('bench not configured to release')
sys.exit(1)
if config.get('branches_to_update'):
branches_to_update.update(config.get('branches_to_update'))
if config.get('releasable_branches'):
releasable_branches.extend(config.get('releasable_branches'),[])
validate(bench_path, config)
bump(bench_path, app, bump_type, from_branch=from_branch, to_branch=to_branch, owner=owner,
@ -91,7 +97,7 @@ def bump(bench_path, app, bump_type, from_branch, to_branch, remote, owner, repo
create_github_release(repo_path, tag_name, message, remote=remote, owner=owner, repo_name=repo_name, prerelease=prerelease)
print('Released {tag} for {repo_path}'.format(tag=tag_name, repo_path=repo_path))
def update_branches_and_check_for_changelog(repo_path, from_branch='develop', to_branch='master', remote='upstream'):
def update_branches_and_check_for_changelog(repo_path, from_branch, to_branch, remote='upstream'):
update_branch(repo_path, to_branch, remote=remote)
update_branch(repo_path, from_branch, remote=remote)
@ -116,7 +122,7 @@ def check_for_unmerged_changelog(repo_path):
if os.path.exists(current) and [f for f in os.listdir(current) if f != "readme.md"]:
raise Exception("Unmerged change log! in " + repo_path)
def get_release_message(repo_path, from_branch='develop', to_branch='master', remote='upstream'):
def get_release_message(repo_path, from_branch, to_branch, remote='upstream'):
print('getting release message for', repo_path, 'comparing', to_branch, '...', from_branch)
repo = git.Repo(repo_path)
@ -127,7 +133,7 @@ def get_release_message(repo_path, from_branch='develop', to_branch='master', re
if log:
return "* " + log.replace('\n', '\n* ')
def bump_repo(repo_path, bump_type, from_branch='develop', to_branch='master'):
def bump_repo(repo_path, bump_type, from_branch, to_branch):
current_version = get_current_version(repo_path, to_branch)
new_version = get_bumped_version(current_version, bump_type)
@ -140,7 +146,7 @@ def get_current_version(repo_path, to_branch):
# TODO clean this up!
version_key = '__version__'
if to_branch.lower() == 'master':
if to_branch.lower() in releasable_branches:
filename = os.path.join(repo_path, os.path.basename(repo_path), '__init__.py')
else:
filename = os.path.join(repo_path, os.path.basename(repo_path), 'hooks.py')
@ -194,7 +200,7 @@ def get_bumped_version(version, bump_type):
return str(v)
def set_version(repo_path, version, to_branch):
if to_branch.lower() == 'master':
if to_branch.lower() in releasable_branches:
set_filename_version(os.path.join(repo_path, os.path.basename(repo_path),'__init__.py'), version, '__version__')
else:
set_filename_version(os.path.join(repo_path, os.path.basename(repo_path),'hooks.py'), version, 'staging_version')
@ -237,14 +243,14 @@ def commit_changes(repo_path, new_version, to_branch):
repo = git.Repo(repo_path)
app_name = os.path.basename(repo_path)
if to_branch.lower() == 'master':
if to_branch.lower() in releasable_branches:
repo.index.add([os.path.join(app_name, '__init__.py')])
else:
repo.index.add([os.path.join(app_name, 'hooks.py')])
repo.index.commit('bumped to version {}'.format(new_version))
def create_release(repo_path, new_version, from_branch='develop', to_branch='master', frontport=True):
def create_release(repo_path, new_version, from_branch, to_branch, frontport=True):
print('creating release for version', new_version)
repo = git.Repo(repo_path)
g = repo.git
@ -283,7 +289,7 @@ def handle_merge_error(e, source, target):
print('-'*80)
click.confirm('Have you manually resolved the error?', abort=True)
def push_release(repo_path, from_branch='develop', to_branch='master', remote='upstream'):
def push_release(repo_path, from_branch, to_branch, remote='upstream'):
print('pushing branches', to_branch, from_branch, 'of', repo_path)
repo = git.Repo(repo_path)
g = repo.git