From a22cd92f39f3373809cb7069336284c717d1e080 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Tue, 28 May 2019 16:14:23 -0400 Subject: [PATCH 01/10] Pin public_suffix to `< 3.1.0` 3.1.0 requires Ruby 2.3, which is not suitable for our releases just yet. --- dpl-pages.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpl-pages.gemspec b/dpl-pages.gemspec index df1e7c0df..27a2a40fd 100644 --- a/dpl-pages.gemspec +++ b/dpl-pages.gemspec @@ -1,3 +1,3 @@ require './gemspec_helper' -gemspec_for 'pages', [['octokit', '~> 4.6.2']] +gemspec_for 'pages', [['octokit', '~> 4.6.2'], ['public_suffix', '< 3.1.0']] From 0331b3f960f8d3fdb040d9772bce01332ad37ee9 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Tue, 28 May 2019 16:32:47 -0400 Subject: [PATCH 02/10] Pin public_suffix to '< 3.1.0' on chef_supermarket, too --- dpl-chef_supermarket.gemspec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dpl-chef_supermarket.gemspec b/dpl-chef_supermarket.gemspec index f9bf7d239..7d62dff0a 100644 --- a/dpl-chef_supermarket.gemspec +++ b/dpl-chef_supermarket.gemspec @@ -1,10 +1,9 @@ require './gemspec_helper' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0") - gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['net-telnet', '~> 0.1.0'], ['chef', '~> 12.0']] + gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['net-telnet', '~> 0.1.0'], ['chef', '~> 12.0'], ['public_suffix', '< 3.1.0']] elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4.0") - gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '~> 13.0']] + gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '~> 13.0'], ['public_suffix', '< 3.1.0']] else - gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '>= 14']] + gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '>= 14'], ['public_suffix', '< 3.1.0']] end - From f71701b21d5675300ac2a9c7228b615e5d9deaa0 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Tue, 28 May 2019 16:51:16 -0400 Subject: [PATCH 03/10] Pin ohai to '~> 13.0' for chef-supermarket --- dpl-chef_supermarket.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpl-chef_supermarket.gemspec b/dpl-chef_supermarket.gemspec index 7d62dff0a..84729b8f3 100644 --- a/dpl-chef_supermarket.gemspec +++ b/dpl-chef_supermarket.gemspec @@ -3,7 +3,7 @@ require './gemspec_helper' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0") gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['net-telnet', '~> 0.1.0'], ['chef', '~> 12.0'], ['public_suffix', '< 3.1.0']] elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4.0") - gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '~> 13.0'], ['public_suffix', '< 3.1.0']] + gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '~> 13.0'], ['public_suffix', '< 3.1.0'], ['ohai', '~> 13.0']] else gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '>= 14'], ['public_suffix', '< 3.1.0']] end From 973503be68ab38b8be5354ff31499489365524dd Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Tue, 28 May 2019 17:07:54 -0400 Subject: [PATCH 04/10] Clean up chef_supermarket deps --- dpl-chef_supermarket.gemspec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dpl-chef_supermarket.gemspec b/dpl-chef_supermarket.gemspec index 84729b8f3..1992773a9 100644 --- a/dpl-chef_supermarket.gemspec +++ b/dpl-chef_supermarket.gemspec @@ -1,9 +1,17 @@ require './gemspec_helper' +deps = [ + ['rack'], + ['mime-types'], + ['public_suffix', '< 3.1.0'], + ['ohai', '~> 13.0'], +] + if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0") - gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['net-telnet', '~> 0.1.0'], ['chef', '~> 12.0'], ['public_suffix', '< 3.1.0']] + deps << ['net-telnet', '~> 0.1.0'] << ['chef', '~> 12.0'] + gemspec_for 'chef_supermarket', deps elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4.0") - gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '~> 13.0'], ['public_suffix', '< 3.1.0'], ['ohai', '~> 13.0']] + gemspec_for 'chef_supermarket', (deps << ['chef', '~> 13.0']) else - gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '>= 14'], ['public_suffix', '< 3.1.0']] + gemspec_for 'chef_supermarket', (deps << ['chef', '>= 14']) end From da9bdf2c793b31b52d9a4e13357fcc987e8ebc53 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Tue, 28 May 2019 22:47:26 -0400 Subject: [PATCH 05/10] Fix chef dependencies --- dpl-chef_supermarket.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dpl-chef_supermarket.gemspec b/dpl-chef_supermarket.gemspec index 1992773a9..d2783fd24 100644 --- a/dpl-chef_supermarket.gemspec +++ b/dpl-chef_supermarket.gemspec @@ -3,15 +3,15 @@ require './gemspec_helper' deps = [ ['rack'], ['mime-types'], - ['public_suffix', '< 3.1.0'], - ['ohai', '~> 13.0'], ] if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0") - deps << ['net-telnet', '~> 0.1.0'] << ['chef', '~> 12.0'] + deps << ['net-telnet', '~> 0.1.0'] << ['chef', '~> 12.0'] << ['public_suffix', '< 3.1.0'] gemspec_for 'chef_supermarket', deps elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4.0") gemspec_for 'chef_supermarket', (deps << ['chef', '~> 13.0']) +elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5.0") + gemspec_for 'chef_supermarket', (deps << ['chef', '~> 14.0']) else gemspec_for 'chef_supermarket', (deps << ['chef', '>= 14']) end From c6a6bfd63aced51c0868e1e465a4c7cd0d9d86a1 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Wed, 29 May 2019 09:42:42 -0400 Subject: [PATCH 06/10] Bump version to 1.10.9 --- lib/dpl/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dpl/version.rb b/lib/dpl/version.rb index 09fb456b4..fe35f5b29 100644 --- a/lib/dpl/version.rb +++ b/lib/dpl/version.rb @@ -1,3 +1,3 @@ module DPL - VERSION = '1.10.8' + VERSION = '1.10.9' end From 32137f2e584ba95e5c5b443f66b26b1792d67854 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Wed, 29 May 2019 11:04:46 -0400 Subject: [PATCH 07/10] Remove duplicate dependencies in *.gemspec On older RubyGems, these will trip `rake` as errors. --- dpl-heroku.gemspec | 2 +- dpl-puppet_forge.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dpl-heroku.gemspec b/dpl-heroku.gemspec index bc9ef9408..9b18b82f5 100644 --- a/dpl-heroku.gemspec +++ b/dpl-heroku.gemspec @@ -1,3 +1,3 @@ require './gemspec_helper' -gemspec_for 'heroku', [['faraday'], ['rendezvous'], ['netrc']] +gemspec_for 'heroku', [['rendezvous'], ['netrc']] diff --git a/dpl-puppet_forge.gemspec b/dpl-puppet_forge.gemspec index f72a23709..ea1c4d731 100644 --- a/dpl-puppet_forge.gemspec +++ b/dpl-puppet_forge.gemspec @@ -1,3 +1,3 @@ require './gemspec_helper' -gemspec_for 'puppet_forge', [['puppet', '~> 5'], ['puppet-blacksmith'], ['json_pure']] +gemspec_for 'puppet_forge', [['puppet', '~> 5'], ['puppet-blacksmith']] From 92f1e78e51b9c60283069d44f66b549f11bc0a42 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Wed, 29 May 2019 11:15:32 -0400 Subject: [PATCH 08/10] Revert "Remove duplicate dependencies in *.gemspec" This reverts commit 32137f2e584ba95e5c5b443f66b26b1792d67854. --- dpl-heroku.gemspec | 2 +- dpl-puppet_forge.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dpl-heroku.gemspec b/dpl-heroku.gemspec index 9b18b82f5..bc9ef9408 100644 --- a/dpl-heroku.gemspec +++ b/dpl-heroku.gemspec @@ -1,3 +1,3 @@ require './gemspec_helper' -gemspec_for 'heroku', [['rendezvous'], ['netrc']] +gemspec_for 'heroku', [['faraday'], ['rendezvous'], ['netrc']] diff --git a/dpl-puppet_forge.gemspec b/dpl-puppet_forge.gemspec index ea1c4d731..f72a23709 100644 --- a/dpl-puppet_forge.gemspec +++ b/dpl-puppet_forge.gemspec @@ -1,3 +1,3 @@ require './gemspec_helper' -gemspec_for 'puppet_forge', [['puppet', '~> 5'], ['puppet-blacksmith']] +gemspec_for 'puppet_forge', [['puppet', '~> 5'], ['puppet-blacksmith'], ['json_pure']] From 695544a7e66b057a1f879aea37df0e0f6e1236c6 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Wed, 29 May 2019 11:21:30 -0400 Subject: [PATCH 09/10] Bump version to 1.10.10 --- lib/dpl/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dpl/version.rb b/lib/dpl/version.rb index fe35f5b29..960adc02c 100644 --- a/lib/dpl/version.rb +++ b/lib/dpl/version.rb @@ -1,3 +1,3 @@ module DPL - VERSION = '1.10.9' + VERSION = '1.10.10' end From 87323cdb8b27a6484e330f999563e06e75e28c7d Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Wed, 29 May 2019 11:46:31 -0400 Subject: [PATCH 10/10] Tweak "Deploy" stage configurations To conform to the correct schema. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5cda0a5d7..f847bdebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ rvm: jobs: include: - stage: deploy + if: branch = master AND NOT type IN (pull_request) cache: false before_deploy: - sed -i.bak "s/VERSION = '.*'/VERSION = '${DPL_VERSION}'/g" lib/dpl/version.rb @@ -17,7 +18,6 @@ jobs: - git commit -m "Update DPL::Version" deploy: - provider: rubygems - script: skip edge: branch: master api_key: @@ -26,7 +26,6 @@ jobs: gemspec_glob: 'dpl*.gemspec' on: repo: travis-ci/dpl - if: branch = master AND NOT type IN (pull_request) allow_failures: env: