diff options
| author | Tom Duffield <tom@chef.io> | 2017-01-20 10:37:25 -0600 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2017-01-20 10:37:25 -0600 |
| commit | 501fd21edf7a3e22ddfb408083bf6af15d4f66d4 (patch) | |
| tree | 83ea22c5b933431e44f3197464b2ab45161665e1 | |
| parent | a2e1d1d4edb74a968b416517fdbdf35740686467 (diff) | |
| download | chef-501fd21edf7a3e22ddfb408083bf6af15d4f66d4.tar.gz | |
Pin nio4r gem to avoid install error
The nio4r gem, which is a dep of celluloid, was having
some install problems. To avoid this we're just pinning it.
Signed-off-by: Tom Duffield <tom@chef.io>
| -rw-r--r-- | acceptance/Gemfile | 5 | ||||
| -rw-r--r-- | acceptance/Gemfile.lock | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile index 59f232fcd3..77b45e733d 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -14,3 +14,8 @@ gem "berkshelf", "4.3.5" # until 2.0.0 is fixed for unstable packages gem "mixlib-install", "1.2.3" + +# nio4r 2.x was throwing a "could not install" error because of a Ruby version +# conflict (that didn't actually exist). Since the only gem that really needs +# it is celluloid, let's just pin it until it becomes a bigger problem. +gem "nio4r", ">= 1.1.0", "< 2.0.0" diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 4489b5f247..d137f6aa94 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -12,13 +12,13 @@ GEM addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) artifactory (2.5.1) - aws-sdk (2.6.48) - aws-sdk-resources (= 2.6.48) - aws-sdk-core (2.6.48) + aws-sdk (2.6.49) + aws-sdk-resources (= 2.6.49) + aws-sdk-core (2.6.49) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.48) - aws-sdk-core (= 2.6.48) + aws-sdk-resources (2.6.49) + aws-sdk-core (= 2.6.49) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -135,7 +135,7 @@ GEM net-ssh (4.0.1) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - nio4r (2.0.0) + nio4r (1.2.1) nori (2.6.0) octokit (4.6.2) sawyer (~> 0.8.0, >= 0.5.3) @@ -249,6 +249,7 @@ DEPENDENCIES kitchen-inspec kitchen-vagrant mixlib-install (= 1.2.3) + nio4r (>= 1.1.0, < 2.0.0) test-kitchen windows_chef_zero winrm-elevated |