Skip to content

Commit

Permalink
Parameterize guld_deploy task.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Berger committed Jan 14, 2015
1 parent 6493c87 commit 0842fa7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dploi_fabric/git.py
Expand Up @@ -87,4 +87,4 @@ def local_branch_matches_remote():
'git rev-parse --symbolic-full-name --abbrev-ref HEAD',
capture=True).strip()
target_branch = env.branch.strip()
return local_branch == env.branch
return local_branch == target_branch
4 changes: 2 additions & 2 deletions dploi_fabric/utils.py
Expand Up @@ -574,7 +574,7 @@ def safe_put(*args, **kwargs):


@task
def gulp_deploy(*args, **kwargs):
def gulp_deploy(css_dir='private', *args, **kwargs):
# Import here to avoid circular references
from .git import local_branch_is_dirty, local_branch_matches_remote

Expand All @@ -583,7 +583,7 @@ def gulp_deploy(*args, **kwargs):
"matches the remote (deployment) branch.")
else:
print "Preparing files (CSS/JS)"
local('compass compile --production')
local('compass compile {}'.format(css_dir))
# Replace compass with 'gulp' when front-end is ready
upload_media('./static/css/', '../static/css/')
upload_media('./static/js/', '../static/js/')

0 comments on commit 0842fa7

Please sign in to comment.