suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Ana Rosas 2016-04-04 16:38:20 +02:00
commit cab8534b4a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@ -388,3 +388,6 @@ DEPENDENCIES
travis-yaml! travis-yaml!
unicorn unicorn
yard-sinatra! yard-sinatra!
BUNDLED WITH
1.12.0.pre.1

2
Rakefile
View File

@ -1,11 +1,13 @@
namespace :db do namespace :db do
env = ENV["RAILS_ENV"] env = ENV["RAILS_ENV"]
if env != 'production'
desc "Create and migrate the #{env} database" desc "Create and migrate the #{env} database"
task :create do task :create do
sh "createdb travis_#{env}" rescue nil sh "createdb travis_#{env}" rescue nil
sh "psql -q travis_#{env} < #{Gem.loaded_specs['travis-migrations'].full_gem_path}/db/structure.sql" sh "psql -q travis_#{env} < #{Gem.loaded_specs['travis-migrations'].full_gem_path}/db/structure.sql"
end end
end end
end
desc "generate gemspec" desc "generate gemspec"
task 'travis-api.gemspec' do task 'travis-api.gemspec' do