DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #546 from sgmap/fix-76

Browse source 
[Fix #76] The develop branch is now dev
This commit is contained in:
gregoirenovel 2017-07-05 14:54:48 +02:00 • committed by GitHub
commit 62832f079a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config.yml
View file

@ -68,7 +68,7 @@ jobs:
- "0a:67:42:7d:7e:b7:e1:3c:48:8f:bf:68:10:51:a8:44" - "0a:67:42:7d:7e:b7:e1:3c:48:8f:bf:68:10:51:a8:44"
- deploy: - deploy:
command: | command: |
if [ "${CIRCLE_BRANCH}" == "develop" ]; then if [ "${CIRCLE_BRANCH}" == "dev" ]; then
bundle exec rake deploy_ha bundle exec rake deploy_ha
fi fi

2
config/deploy.rb
View file

@ -24,7 +24,7 @@ set :deploy_to, '/var/www/tps_dev'
case ENV["to"] case ENV["to"]
when "staging" when "staging"
set :branch, ENV['branch'] || 'develop' set :branch, ENV['branch'] || 'dev'
set :deploy_to, '/var/www/tps_dev' set :deploy_to, '/var/www/tps_dev'
set :user, 'tps_dev' # Username in the server to SSH to. set :user, 'tps_dev' # Username in the server to SSH to.
appname = 'tps_dev' appname = 'tps_dev'