From 732e8a956d0e83e12446c72b56681037a5914ffd Mon Sep 17 00:00:00 2001 From: carlad Date: Fri, 22 Apr 2016 13:46:18 +0200 Subject: [PATCH 1/3] bump travis-core for builds after number fix --- Gemfile | 2 +- Gemfile.lock | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index da99c923..43467835 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', branch: 'cd-after-number' 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 3bd6b288..62d9a222 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,8 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: f1d4c3246ea7a5434076fdc7026aa11a2c90bdac + revision: 3b6111ec37bfba74266c9662bf2171500b8b553d + branch: cd-after-number specs: travis-core (0.0.1) actionmailer (~> 3.2.19) @@ -192,7 +193,7 @@ GEM multi_json (~> 1.0) net-http-persistent (>= 2.7) net-http-pipeline - google-api-client (0.9.4) + google-api-client (0.9.5) addressable (~> 2.3) googleauth (~> 0.5) httpclient (~> 2.7) @@ -294,7 +295,7 @@ GEM rdoc (3.12.2) json (~> 1.4) redcarpet (2.3.0) - redis (3.2.2) + redis (3.3.0) redis-namespace (1.5.1) redis (~> 3.0, >= 3.0.4) representable (2.3.0) @@ -366,7 +367,7 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.48) + tzinfo (0.3.49) uber (0.0.15) unicorn (4.8.3) kgio (~> 2.6) @@ -424,3 +425,6 @@ DEPENDENCIES travis-yaml! unicorn yard-sinatra! + +BUNDLED WITH + 1.10.6 From c6ddffc85ad91a3042bfa32837be1a4a431f143d Mon Sep 17 00:00:00 2001 From: carlad Date: Fri, 22 Apr 2016 14:01:46 +0200 Subject: [PATCH 2/3] bump travis core --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 62d9a222..345a4ec7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 3b6111ec37bfba74266c9662bf2171500b8b553d + revision: 17cf843012ed32fac1439a52a6238a07b56cbe50 branch: cd-after-number specs: travis-core (0.0.1) From 4ec8e1acdc6f8bb7a7edb7888dee4198f90a4923 Mon Sep 17 00:00:00 2001 From: carlad Date: Fri, 22 Apr 2016 14:45:53 +0200 Subject: [PATCH 3/3] bump travis-core use master --- Gemfile | 2 +- Gemfile.lock | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 43467835..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', branch: 'cd-after-number' +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 345a4ec7..d038c01b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,8 +48,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 17cf843012ed32fac1439a52a6238a07b56cbe50 - branch: cd-after-number + revision: 1f723c183993c7961cf2db76037e03cef4769e23 specs: travis-core (0.0.1) actionmailer (~> 3.2.19)