From 1dd47df6bfcc8c640bfa701df7c4108c26539270 Mon Sep 17 00:00:00 2001 From: carlad Date: Wed, 30 Mar 2016 12:18:05 +0200 Subject: [PATCH 1/3] add better condition check for rake --- Rakefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Rakefile b/Rakefile index 5d4cd585..0b13d449 100644 --- a/Rakefile +++ b/Rakefile @@ -1,10 +1,11 @@ namespace :db do env = ENV["RAILS_ENV"] - fail "Cannot run rake db:create in production." if env == 'production' - desc "Create and migrate the #{env} database" - task :create do - sh "createdb travis_#{env}" rescue nil - sh "psql -q travis_#{env} < #{Gem.loaded_specs['travis-migrations'].full_gem_path}/db/structure.sql" + if env != 'production' + desc "Create and migrate the #{env} database" + task :create do + sh "createdb travis_#{env}" rescue nil + sh "psql -q travis_#{env} < #{Gem.loaded_specs['travis-migrations'].full_gem_path}/db/structure.sql" + end end end From 2f870e6826feb876e4b852e15b47fe6e06ebb2c8 Mon Sep 17 00:00:00 2001 From: Tyranja Date: Wed, 30 Mar 2016 16:35:34 +0200 Subject: [PATCH 2/3] Bump travis-core --- Gemfile | 2 +- Gemfile.lock | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index da99c923..cf09b3c1 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.1.7' if ENV.key?('DYNO') gem 's3', github: 'travis-ci/s3' -gem 'travis-core', github: 'travis-ci/travis-core' +gem 'travis-core', github: 'travis-ci/travis-core', ref: 'sf-ar-te' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-amqp', github: 'travis-ci/travis-amqp' gem 'travis-config', '~> 0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7f9f612b..665485d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,8 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: f7b3a76b3f39c28bb5cf7b9dc24acec13908a11a + revision: fdcd69981dc9ccb6f85452213d8bdc096f4308be + ref: sf-ar-te specs: travis-core (0.0.1) actionmailer (~> 3.2.19) @@ -56,7 +57,7 @@ GIT coder (~> 0.4.0) data_migrations (~> 0.0.1) gh - hashr (~> 0.0.19) + hashr metriks (~> 0.9.7) multi_json pusher (~> 0.14.0) @@ -331,7 +332,7 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.47) + tzinfo (0.3.48) unicorn (4.8.3) kgio (~> 2.6) rack @@ -388,3 +389,6 @@ DEPENDENCIES travis-yaml! unicorn yard-sinatra! + +BUNDLED WITH + 1.12.0.pre.1 From 7f4d67ea8d23fdd6f8bd45e100041a2e67a31824 Mon Sep 17 00:00:00 2001 From: carlad Date: Mon, 4 Apr 2016 16:21:16 +0200 Subject: [PATCH 3/3] remove core pointing to branch --- Gemfile | 2 +- Gemfile.lock | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index cf09b3c1..da99c923 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.1.7' if ENV.key?('DYNO') gem 's3', github: 'travis-ci/s3' -gem 'travis-core', github: 'travis-ci/travis-core', ref: 'sf-ar-te' +gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-amqp', github: 'travis-ci/travis-amqp' gem 'travis-config', '~> 0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 665485d0..563536fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,8 +48,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: fdcd69981dc9ccb6f85452213d8bdc096f4308be - ref: sf-ar-te + revision: 9978518236afb520c8fff68bebe7beb62f8ad776 specs: travis-core (0.0.1) actionmailer (~> 3.2.19)