summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-01-13 10:34:07 -0800
committerTim Smith <tsmith84@gmail.com>2021-01-19 21:08:13 -0800
commit5bc0ad2f57f048951a0c4847da3a142cceb3dae3 (patch)
tree788a7cff08661a72d75935764819e03c25811893
parent5528bc658301f1b0e5ed54a2ae9617c436a1ae5e (diff)
downloadchef-5bc0ad2f57f048951a0c4847da3a142cceb3dae3.tar.gz
Pin rspec until we can resolve failures with 3.10
3.10 is causing failures in CI. This pins it so we can keep bumping our other deps Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock11
-rw-r--r--omnibus/Gemfile.lock28
3 files changed, 25 insertions, 19 deletions
diff --git a/Gemfile b/Gemfile
index 77155db72e..9abadfcaa1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,8 @@
source "https://rubygems.org"
+# pin until issues with Windows builds in 1.14.2 are resolved
+gem "ffi", "=1.13.1"
+
# Note we do not use the gemspec DSL which restricts to the
# gemspec for the current platform and filters out other platforms
# during a bundle lock operation. We actually want dependencies from
@@ -50,7 +53,7 @@ end
group(:development, :test) do
gem "rake"
- gem "rspec"
+ gem "rspec", "=3.9.0" # remove pin once https://github.com/chef/chef/issues/10817 is resolved
gem "webmock"
gem "fauxhai-ng" # for chef-utils gem
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 79c50c425b..846187e75d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -280,7 +280,7 @@ GEM
public_suffix (4.0.6)
rack (2.2.3)
rainbow (3.0.0)
- rake (13.0.1)
+ rake (13.0.3)
rb-readline (0.5.5)
regexp_parser (2.0.3)
rexml (3.2.4)
@@ -327,7 +327,7 @@ GEM
syslog-logger (1.6.8)
thor (1.0.1)
tomlrb (1.2.9)
- train-core (3.4.4)
+ train-core (3.4.7)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
@@ -358,8 +358,8 @@ GEM
tty-screen (~> 0.8)
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
- uuidtools (2.1.5)
- webmock (3.11.0)
+ uuidtools (2.2.0)
+ webmock (3.11.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@@ -423,6 +423,7 @@ DEPENDENCIES
cheffish (>= 14)
chefstyle (= 1.5.9)
fauxhai-ng
+ ffi (= 1.13.1)
inspec-core-bin (~> 4.24)
ohai!
pry
@@ -430,7 +431,7 @@ DEPENDENCIES
pry-stack_explorer
rake
rb-readline
- rspec
+ rspec (= 3.9.0)
ruby-prof (< 1.3.0)
ruby-shadow
webmock
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 4fa1c775cd..622bc57855 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (16.9.16)
+ chef (16.9.20)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10)
- chef-config (= 16.9.16)
- chef-utils (= 16.9.16)
+ chef-config (= 16.9.20)
+ chef-utils (= 16.9.20)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -101,12 +101,12 @@ GEM
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.9.16-universal-mingw32)
+ chef (16.9.20-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10)
- chef-config (= 16.9.16)
- chef-utils (= 16.9.16)
+ chef-config (= 16.9.20)
+ chef-utils (= 16.9.20)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -150,9 +150,9 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
- chef-config (16.9.16)
+ chef-config (16.9.20)
addressable
- chef-utils (= 16.9.16)
+ chef-utils (= 16.9.20)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -161,7 +161,7 @@ GEM
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
- chef-utils (16.9.16)
+ chef-utils (16.9.20)
chef-vault (4.1.0)
chef-zero (15.0.4)
ffi-yajl (~> 2.2)
@@ -178,9 +178,11 @@ GEM
ed25519 (1.2.4)
erubi (1.10.0)
erubis (2.7.0)
- faraday (1.1.0)
+ faraday (1.3.0)
+ faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
+ faraday-net_http (1.0.1)
ffi (1.14.2)
ffi (1.14.2-x64-mingw32)
ffi (1.14.2-x86-mingw32)
@@ -199,10 +201,10 @@ GEM
highline (2.0.3)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.24.28)
+ inspec-core (4.24.32)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
- faraday (>= 0.9.0, < 1.2)
+ faraday (>= 0.9.0, < 1.4)
hashie (>= 3.4, < 5.0)
license-acceptance (>= 0.2.13, < 3.0)
method_source (>= 0.8, < 2.0)
@@ -331,7 +333,7 @@ GEM
rspec-support (~> 3.10.0)
rspec-support (3.10.1)
ruby-progressbar (1.11.0)
- ruby2_keywords (0.0.2)
+ ruby2_keywords (0.0.4)
rubyntlm (0.6.2)
rubyzip (2.3.0)
sawyer (0.8.2)