Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies: omnibus-software, sidekiq-cron, sidekiq, octokit, ddtrace #2782

Merged
merged 6 commits into from
Jun 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 9b0e6051c0fcb9cb63b341a298b1c4e9d8c027e5
revision: ccc7269827cbdaae94141ec381d5894fa7e1f081
branch: main
specs:
omnibus-software (4.0.0)
Expand Down Expand Up @@ -35,7 +35,7 @@ GEM
ast (2.4.2)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
aws-partitions (1.595.0)
aws-partitions (1.598.0)
aws-sdk-core (3.131.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
Expand Down Expand Up @@ -218,7 +218,7 @@ GEM
tomlrb (>= 1.2, < 3.0)
tty-box (~> 0.6)
tty-prompt (~> 0.20)
license_scout (1.3.1)
license_scout (1.3.2)
ffi-yajl (~> 2.2)
mixlib-shellout (>= 2.2, < 4.0)
toml-rb (>= 1, < 3)
Expand All @@ -232,7 +232,7 @@ GEM
mixlib-log
mixlib-authentication (3.0.10)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
mixlib-config (3.0.27)
tomlrb
mixlib-install (3.12.16)
mixlib-shellout
Expand All @@ -244,7 +244,7 @@ GEM
mixlib-versioning (1.2.12)
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.2.0)
multipart-post (2.2.3)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-sftp (3.0.0)
Expand Down
4 changes: 2 additions & 2 deletions src/supermarket/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ gem "sidekiq-cron"
gem "aws-sdk-s3"
gem "chef", "~> 17.10", require: false
gem "compass-rails"
gem "ddtrace", "1.0.0", require: false
gem "ddtrace", "1.1.0", require: false
gem "dotenv"
gem "ffi-libarchive"
gem "foreman"
Expand All @@ -26,7 +26,7 @@ gem "jbuilder"
gem "kaminari"
gem "mixlib-authentication", "~> 3.0"
gem "nokogiri"
gem "octokit", "~> 4.23", require: false # 4.16+ fixes deprecations in auth
gem "octokit", "~> 4.24", require: false # 4.16+ fixes deprecations in auth
gem "pg"
gem "pg_search"
gem "premailer-rails", group: [:development, :production]
Expand Down
22 changes: 12 additions & 10 deletions src/supermarket/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,12 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
ddtrace (1.0.0)
debase-ruby_core_source (<= 0.10.15)
libddwaf (~> 1.3.0.0.0.a)
ddtrace (1.1.0)
debase-ruby_core_source (<= 0.10.16)
libddprof (~> 0.6.0.1.0)
libddwaf (~> 1.3.0.2.0)
msgpack
debase-ruby_core_source (0.10.15)
debase-ruby_core_source (0.10.16)
diff-lcs (1.5.0)
digest (3.1.0)
docile (1.4.0)
Expand Down Expand Up @@ -386,7 +387,8 @@ GEM
letter_opener (~> 1.7)
railties (>= 5.2)
rexml
libddwaf (1.3.0.0.0-x86_64-linux)
libddprof (0.6.0.1.0-x86_64-linux)
libddwaf (1.3.0.2.0-x86_64-linux)
ffi (~> 1.0)
libhoney (2.2.0)
addressable (~> 2.0)
Expand Down Expand Up @@ -438,7 +440,7 @@ GEM
mixlib-log (3.0.9)
mixlib-shellout (3.2.7)
chef-utils
msgpack (1.5.1)
msgpack (1.5.2)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.2.0)
Expand Down Expand Up @@ -475,7 +477,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.23.0)
octokit (4.24.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
ohai (17.9.0)
Expand Down Expand Up @@ -679,7 +681,7 @@ GEM
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
sidekiq-cron (1.4.0)
sidekiq-cron (1.5.0)
fugit (~> 1)
sidekiq (>= 4.2.1)
simplecov (0.21.2)
Expand Down Expand Up @@ -824,7 +826,7 @@ DEPENDENCIES
compass-rails
cookstyle (~> 7.32.1)
database_cleaner
ddtrace (= 1.0.0)
ddtrace (= 1.1.0)
dotenv
dry-struct (~> 1.4)
execjs
Expand All @@ -848,7 +850,7 @@ DEPENDENCIES
mixlib-authentication (~> 3.0)
net-smtp
nokogiri
octokit (~> 4.23)
octokit (~> 4.24)
omniauth (~> 2.1.0)
omniauth-chef-oauth2
omniauth-github (~> 2.0.0)
Expand Down
4 changes: 2 additions & 2 deletions src/supermarket/engines/fieri/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ GEM
racc (~> 1.4)
nokogiri (1.13.6-x86_64-linux)
racc (~> 1.4)
octokit (4.23.0)
octokit (4.24.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
parallel (1.22.1)
Expand Down Expand Up @@ -226,7 +226,7 @@ GEM
sawyer (0.9.1)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
sidekiq (6.4.2)
sidekiq (6.5.0)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
Expand Down