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

[fix] to make compatible with new release functionality

Browse Source
This commit is contained in:
Saurabh 2017-07-25 18:00:54 +05:30
parent 9b99b1d34f
commit ce4a02b224
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bench/prepare_staging.py
View File

@ -2,6 +2,7 @@
import os import os
import git import git
import click import click
from .config.common_site_config import get_config
github_username = None github_username = None
github_password = None github_password = None
@ -12,7 +13,7 @@ def prepare_staging(bench_path, app, remote='upstream'):
repo_path = os.path.join(bench_path, 'apps', app) repo_path = os.path.join(bench_path, 'apps', app)
update_branches(repo_path, remote) update_branches(repo_path, remote)
message = get_release_message(repo_path, develop='develop', master='staging', remote=remote) message = get_release_message(repo_path, from_branch='develop', to_branch='staging', remote=remote)
if not message: if not message:
print('No commits to release') print('No commits to release')
@ -29,7 +30,9 @@ def prepare_staging(bench_path, app, remote='upstream'):
def validate(bench_path): def validate(bench_path):
from .release import validate from .release import validate
validate(bench_path)
config = get_config(bench_path)
validate(bench_path, config)
def update_branches(repo_path, remote): def update_branches(repo_path, remote):
from .release import update_branch from .release import update_branch
@ -38,23 +41,23 @@ def update_branches(repo_path, remote):
git.Repo(repo_path).git.checkout('develop') git.Repo(repo_path).git.checkout('develop')
def create_staging(repo_path, develop='develop'): def create_staging(repo_path, from_branch='develop'):
from .release import handle_merge_error from .release import handle_merge_error
print('creating staging from', develop) print('creating staging from', from_branch)
repo = git.Repo(repo_path) repo = git.Repo(repo_path)
g = repo.git g = repo.git
g.checkout('staging') g.checkout('staging')
try: try:
g.merge(develop, '--no-ff') g.merge(from_branch, '--no-ff')
except git.exc.GitCommandError as e: except git.exc.GitCommandError as e:
handle_merge_error(e, source=develop, target='staging') handle_merge_error(e, source=from_branch, target='staging')
g.checkout(develop) g.checkout(from_branch)
try: try:
g.merge('staging') g.merge('staging')
except git.exc.GitCommandError as e: except git.exc.GitCommandError as e:
handle_merge_error(e, source='staging', target=develop) handle_merge_error(e, source='staging', target=from_branch)
def push_commits(repo_path, remote='upstream'): def push_commits(repo_path, remote='upstream'):
print('pushing staging branch of', repo_path) print('pushing staging branch of', repo_path)