mirror of
https://github.com/frappe/bench.git
synced 2025-01-27 00:08:24 +00:00
[fix] provision to handle release from staging branch
This commit is contained in:
parent
102bda273b
commit
8632817268
@ -4,10 +4,8 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
import semantic_version
|
import semantic_version
|
||||||
import git
|
import git
|
||||||
import json
|
|
||||||
import requests
|
import requests
|
||||||
import getpass
|
import getpass
|
||||||
import argparse
|
|
||||||
import re
|
import re
|
||||||
from requests.auth import HTTPBasicAuth
|
from requests.auth import HTTPBasicAuth
|
||||||
import requests.exceptions
|
import requests.exceptions
|
||||||
@ -18,6 +16,12 @@ import click
|
|||||||
github_username = None
|
github_username = None
|
||||||
github_password = None
|
github_password = None
|
||||||
|
|
||||||
|
branches_to_update = {
|
||||||
|
'develop': [],
|
||||||
|
'staging': ['develop', 'hotfix'],
|
||||||
|
'hotfix': ['develop', 'staging']
|
||||||
|
}
|
||||||
|
|
||||||
def release(bench_path, app, bump_type, develop='develop', master='master',
|
def release(bench_path, app, bump_type, develop='develop', master='master',
|
||||||
remote='upstream', owner='frappe', repo_name=None):
|
remote='upstream', owner='frappe', repo_name=None):
|
||||||
|
|
||||||
@ -74,8 +78,9 @@ def update_branches_and_check_for_changelog(repo_path, develop='develop', master
|
|||||||
|
|
||||||
update_branch(repo_path, master, remote=remote)
|
update_branch(repo_path, master, remote=remote)
|
||||||
update_branch(repo_path, develop, remote=remote)
|
update_branch(repo_path, develop, remote=remote)
|
||||||
if develop != 'develop':
|
|
||||||
update_branch(repo_path, 'develop', remote=remote)
|
for branch in branches_to_update[develop]:
|
||||||
|
update_branch(repo_path, branch, remote=remote)
|
||||||
|
|
||||||
git.Repo(repo_path).git.checkout(develop)
|
git.Repo(repo_path).git.checkout(develop)
|
||||||
check_for_unmerged_changelog(repo_path)
|
check_for_unmerged_changelog(repo_path)
|
||||||
@ -218,13 +223,13 @@ def create_release(repo_path, new_version, develop='develop', master='master'):
|
|||||||
except git.exc.GitCommandError as e:
|
except git.exc.GitCommandError as e:
|
||||||
handle_merge_error(e, source=master, target=develop)
|
handle_merge_error(e, source=master, target=develop)
|
||||||
|
|
||||||
if develop != 'develop':
|
for branch in branches_to_update[develop]:
|
||||||
print('merging master into develop')
|
print('merging master into', branch)
|
||||||
g.checkout('develop')
|
g.checkout(branch)
|
||||||
try:
|
try:
|
||||||
g.merge(master)
|
g.merge(master)
|
||||||
except git.exc.GitCommandError as e:
|
except git.exc.GitCommandError as e:
|
||||||
handle_merge_error(e, source=master, target='develop')
|
handle_merge_error(e, source=master, target=branch)
|
||||||
|
|
||||||
return tag_name
|
return tag_name
|
||||||
|
|
||||||
@ -245,9 +250,9 @@ def push_release(repo_path, develop='develop', master='master', remote='upstream
|
|||||||
'{develop}:{develop}'.format(develop=develop)
|
'{develop}:{develop}'.format(develop=develop)
|
||||||
]
|
]
|
||||||
|
|
||||||
if develop != 'develop':
|
for branch in branches_to_update[develop]:
|
||||||
print('pushing develop branch of', repo_path)
|
print('pushing {0} branch of'.format(branch), repo_path)
|
||||||
args.append('develop:develop')
|
args.append('{branch}:{branch}'.format(branch=branch))
|
||||||
|
|
||||||
args.append('--tags')
|
args.append('--tags')
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user