Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Fix the dependency updater so Chef Client is updated #1178

Merged
merged 1 commit into from
Feb 24, 2017
Merged

Fix the dependency updater so Chef Client is updated #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ group(:omnibus_package) do
gem "chef-provisioning-vagrant", ">= 0.11.0"
gem "chef-vault"
# The chef version is pinned by "rake dependencies", which grabs the current version from omnibus.
gem "chef", github: "chef/chef", branch: "v12.18.31"
gem "chef", github: "chef/chef", branch: "v12.19.36"
gem "cheffish", ">= 4.0"
gem "chefspec"
gem "fauxhai"
Expand Down
54 changes: 27 additions & 27 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,28 @@ GIT

GIT
remote: git://github.com/chef/chef.git
revision: 28da683d4820e7081aa94c9ff9d1b6791bd36793
branch: v12.18.31
revision: 7b8ceacf4fe474587a485b5ad23713a5c0096145
branch: v12.19.36
specs:
chef (12.18.31)
chef (12.19.36)
addressable
bundler (>= 1.10)
chef-config (= 12.18.31)
chef-config (= 12.19.36)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
mixlib-archive (>= 0.2.0)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.7)
mixlib-log (~> 1.3)
mixlib-shellout (~> 2.0)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 4.0)
net-ssh-multi (~> 1.1)
ohai (>= 8.6.0.alpha.1, < 9)
net-ssh (>= 2.9, < 5.0)
net-ssh-multi (~> 1.2, >= 1.2.1)
ohai (>= 8.6.0.alpha.1, < 13)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
Expand All @@ -39,26 +39,26 @@ GIT
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
chef (12.18.31-universal-mingw32)
chef (12.19.36-universal-mingw32)
addressable
bundler (>= 1.10)
chef-config (= 12.18.31)
chef-config (= 12.19.36)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
mixlib-archive (>= 0.2.0)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.7)
mixlib-log (~> 1.3)
mixlib-shellout (~> 2.0)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 4.0)
net-ssh-multi (~> 1.1)
ohai (>= 8.6.0.alpha.1, < 9)
net-ssh (>= 2.9, < 5.0)
net-ssh-multi (~> 1.2, >= 1.2.1)
ohai (>= 8.6.0.alpha.1, < 13)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
Expand All @@ -79,11 +79,6 @@ GIT
win32-service (~> 0.8.7)
windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
chef-config (12.18.31)
addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)

GIT
remote: git://github.com/chef/opscode-pushy-client.git
Expand Down Expand Up @@ -143,13 +138,13 @@ GEM
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
aws-sdk (2.7.14)
aws-sdk-resources (= 2.7.14)
aws-sdk-core (2.7.14)
aws-sdk (2.7.15)
aws-sdk-resources (= 2.7.15)
aws-sdk-core (2.7.15)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.7.14)
aws-sdk-core (= 2.7.14)
aws-sdk-resources (2.7.15)
aws-sdk-core (= 2.7.15)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
Expand Down Expand Up @@ -192,6 +187,11 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef-config (12.19.36)
addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
chef-provisioning (2.1.1)
cheffish (~> 4.0)
inifile (>= 2.0.2)
Expand Down Expand Up @@ -230,7 +230,7 @@ GEM
cheffish (4.1.1)
chef-zero (~> 5.0)
net-ssh
chefspec (6.0.0)
chefspec (6.0.1)
chef (>= 12.0)
fauxhai (~> 3.6)
rspec (~> 3.0)
Expand Down Expand Up @@ -459,7 +459,7 @@ GEM
thor (>= 0.18.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.4)
hashie (3.5.5)
highline (1.7.8)
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
Expand Down Expand Up @@ -562,7 +562,7 @@ GEM
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
net-ssh (4.1.0)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.2.1)
Expand Down
12 changes: 6 additions & 6 deletions acceptance/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ GEM
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
artifactory (2.7.0)
aws-sdk (2.7.14)
aws-sdk-resources (= 2.7.14)
aws-sdk-core (2.7.14)
aws-sdk (2.7.15)
aws-sdk-resources (= 2.7.15)
aws-sdk-core (2.7.15)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.7.14)
aws-sdk-core (= 2.7.14)
aws-sdk-resources (2.7.15)
aws-sdk-core (= 2.7.15)
aws-sigv4 (1.0.0)
berkshelf (5.6.3)
addressable (~> 2.3, >= 2.3.4)
Expand Down Expand Up @@ -75,7 +75,7 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.4)
hashie (3.5.5)
hitimes (1.2.4)
httpclient (2.8.3)
inspec (1.14.1)
Expand Down
12 changes: 6 additions & 6 deletions omnibus/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
artifactory (2.7.0)
awesome_print (1.7.0)
aws-sdk (2.7.14)
aws-sdk-resources (= 2.7.14)
aws-sdk-core (2.7.14)
aws-sdk (2.7.15)
aws-sdk-resources (= 2.7.15)
aws-sdk-core (2.7.15)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.7.14)
aws-sdk-core (= 2.7.14)
aws-sdk-resources (2.7.15)
aws-sdk-core (= 2.7.15)
aws-sigv4 (1.0.0)
berkshelf (5.6.3)
addressable (~> 2.3, >= 2.3.4)
Expand Down Expand Up @@ -92,7 +92,7 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.4)
hashie (3.5.5)
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.8.3)
Expand Down
8 changes: 5 additions & 3 deletions tasks/dependencies.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
namespace :dependencies do
# Update all dependencies to the latest constraint-matching version
desc "Update all dependencies."
# Until 12.14 is released we've removed this first task from update
# dependencies:update_stable_channel_gems
task :update => %w{
dependencies:update_stable_channel_gems
dependencies:update_gemfile_lock
dependencies:update_omnibus_overrides
dependencies:update_omnibus_gemfile_lock
Expand Down Expand Up @@ -99,7 +98,10 @@ def berksfile_lock_task(task_name, dirs: [])
gemfile_path = File.join(project_root, "Gemfile")
gemfile = IO.read(gemfile_path)
update_gemfile_from_stable(gemfile, "chef", "chef", "v")
update_gemfile_from_stable(gemfile, "push-jobs-client", "opscode-pushy-client")
# TODO: Uncomment this when push-job-client builds are passing again.
# Right now, the latest version is pinned to a super old version of Chef
# so it could be build standalone.
# update_gemfile_from_stable(gemfile, "push-jobs-client", "opscode-pushy-client")

if gemfile != IO.read(gemfile_path)
puts "Writing modified #{gemfile_path} ..."
Expand Down