Skip to content

Commit

Permalink
deploy_self needs capistrano development env ref #78
Browse files Browse the repository at this point in the history
  • Loading branch information
seeReadCode committed Apr 5, 2017
1 parent 647e120 commit 6275265
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
6 changes: 0 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,3 @@ git push

## Making changes
The `master` branch is used for our auto-deploy process and should be deploy-ready. Minor changes should target or be made on the `develop` branch. Substantial, feature-related changes should be made on a corresponding feature branch based off of `develop` branch. Commits should be rebased for conciseness and clarity before pull requests are made.

Changes are merged into `master` with a squash:

```
git merge --squash develop
```
1 change: 0 additions & 1 deletion app/controllers/home_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def deploy
Process.detach(pid)
Time.now
end
Rails.logger.info "Deploying"
render nothing: true
end

Expand Down
4 changes: 2 additions & 2 deletions bin/deploy_self.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ tar -zcvf $DIR.tar.gz ~/backups
rm -rf $DIR

#deploy
source ~/.bash_profile
git pull
bundle install
bundle exec cap production deploy
RAILS_ENV=development bundle install; bundle exec cap production deploy

0 comments on commit 6275265

Please sign in to comment.