Merge pull request #1455 from consul/scm-config
updates capistrano scm config
This commit is contained in:
4
Capfile
4
Capfile
@@ -12,6 +12,10 @@ require 'capistrano/delayed_job'
|
|||||||
require 'whenever/capistrano'
|
require 'whenever/capistrano'
|
||||||
require 'rvm1/capistrano3'
|
require 'rvm1/capistrano3'
|
||||||
|
|
||||||
|
#SCM: Git
|
||||||
|
require "capistrano/scm/git"
|
||||||
|
install_plugin Capistrano::SCM::Git
|
||||||
|
|
||||||
# Load custom tasks from `lib/capistrano/tasks` if you have any defined
|
# Load custom tasks from `lib/capistrano/tasks` if you have any defined
|
||||||
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
|
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
|
||||||
Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
|
Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ set :full_app_name, deploysecret(:full_app_name)
|
|||||||
set :server_name, deploysecret(:server_name)
|
set :server_name, deploysecret(:server_name)
|
||||||
set :repo_url, 'https://github.com/consul/consul.git'
|
set :repo_url, 'https://github.com/consul/consul.git'
|
||||||
|
|
||||||
set :scm, :git
|
|
||||||
set :revision, `git rev-parse --short #{fetch(:branch)}`.strip
|
set :revision, `git rev-parse --short #{fetch(:branch)}`.strip
|
||||||
|
|
||||||
set :log_level, :info
|
set :log_level, :info
|
||||||
|
|||||||
Reference in New Issue
Block a user