From 58b5d8d03adddd8122617059e99183b206824fe0 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sun, 19 Oct 2014 17:13:12 +0200 Subject: [PATCH 1/3] use travis-config rubygem --- Gemfile | 3 ++- Gemfile.lock | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 5c0652f9..34edea69 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,9 @@ ruby '2.1.2' source 'https://rubygems.org' gemspec -gem 'travis-core', github: 'travis-ci/travis-core' +gem 'travis-core', github: 'travis-ci/travis-core', ref: 'sf-extract-travis-config' gem 'travis-support', github: 'travis-ci/travis-support' +gem 'travis-config', '~> 0.1.0' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741' gem 'travis-yaml', github: 'travis-ci/travis-yaml' gem 'sinatra' diff --git a/Gemfile.lock b/Gemfile.lock index 09992aff..d8d0e83f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,8 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 68c49a7d74f92a004cda8aa20f17261ace9ddf05 + revision: 0312efea8fc67b3a2d3d153acb0a5d28a23e6eff + ref: sf-extract-travis-config specs: travis-core (0.0.1) actionmailer (~> 3.2.19) @@ -55,6 +56,7 @@ GIT s3 (~> 0.3) simple_states (~> 1.0.0) thor (~> 0.14.6) + travis-config (~> 0.1.0) virtus (~> 1.0.0) GIT @@ -310,6 +312,8 @@ GEM tilt (1.4.1) timers (4.0.1) hitimes + travis-config (0.1.0) + hashr (~> 0.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -353,6 +357,7 @@ DEPENDENCIES sinatra sinatra-contrib travis-api! + travis-config (~> 0.1.0) travis-core! travis-sidekiqs! travis-support! From f1bff9419c9d2e6af84827fb497b128870bac229 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sun, 19 Oct 2014 17:43:20 +0200 Subject: [PATCH 2/3] remove travis-core branch --- Gemfile | 2 +- Gemfile.lock | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 34edea69..0e4250f8 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ ruby '2.1.2' source 'https://rubygems.org' gemspec -gem 'travis-core', github: 'travis-ci/travis-core', ref: 'sf-extract-travis-config' +gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-config', '~> 0.1.0' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741' diff --git a/Gemfile.lock b/Gemfile.lock index d8d0e83f..1d0c074b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,8 +36,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 0312efea8fc67b3a2d3d153acb0a5d28a23e6eff - ref: sf-extract-travis-config + revision: c42dd1ccf6340ec1c95c4ec308f057a86be0f6b2 specs: travis-core (0.0.1) actionmailer (~> 3.2.19) From b695c1be7ea191644bde70700620c46eb602de0d Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sun, 19 Oct 2014 18:21:20 +0200 Subject: [PATCH 3/3] bump travis-core --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d0c074b..464628f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: c42dd1ccf6340ec1c95c4ec308f057a86be0f6b2 + revision: 0f487381ecf7f06f759116b60a1e9e8544784286 specs: travis-core (0.0.1) actionmailer (~> 3.2.19)