Skip to content

Commit

Permalink
CHEF-17644- Workstation 25.2 release (#3294)
Browse files Browse the repository at this point in the history
* testing chef-cli with updated diff-lcs version

Signed-off-by: nikhil2611 <[email protected]>

* updated lock file

Signed-off-by: nikhil2611 <[email protected]>

* reverted back chef-cli from root Gemfile

Signed-off-by: nikhil2611 <[email protected]>

* fixing win build

Signed-off-by: nikhil2611 <[email protected]>

* fixing win pipeline

Signed-off-by: nikhil2611 <[email protected]>

* trying to use chef-apply latest version

Signed-off-by: nikhil2611 <[email protected]>

* updated omnibus-software to latest

Signed-off-by: nikhil2611 <[email protected]>

* trying to add updated mixlib-shellout

Signed-off-by: nikhil2611 <[email protected]>

* Updated knife version

Signed-off-by: nikhil2611 <[email protected]>

* removed the branch pick of chef-cli and chef-apply

Signed-off-by: nikhil2611 <[email protected]>

* few other fixes

Signed-off-by: nikhil2611 <[email protected]>

* updating hab version to latest

Signed-off-by: nikhil2611 <[email protected]>

---------

Signed-off-by: nikhil2611 <[email protected]>
  • Loading branch information
nikhil2611 authored Feb 3, 2025
1 parent a9e5b83 commit ac0875d
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 50 deletions.
75 changes: 38 additions & 37 deletions components/gems/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GEM
artifactory (3.0.17)
ast (2.4.2)
aws-eventstream (1.3.0)
aws-partitions (1.1023.0)
aws-partitions (1.1043.0)
aws-sdk-account (1.35.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -94,7 +94,7 @@ GEM
aws-sdk-configservice (1.123.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-core (3.214.0)
aws-sdk-core (3.217.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
Expand Down Expand Up @@ -165,8 +165,8 @@ GEM
aws-sdk-kinesis (1.71.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (1.97.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sigv4 (~> 1.5)
aws-sdk-lambda (1.144.0)
aws-sdk-core (~> 3, >= 3.210.0)
Expand Down Expand Up @@ -201,8 +201,8 @@ GEM
aws-sdk-route53resolver (1.74.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.176.1)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-s3 (1.179.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sdk-s3control (1.43.0)
Expand Down Expand Up @@ -254,7 +254,7 @@ GEM
aws-sdk-core (~> 3, >= 3.122.0)
aws-sigv4 (~> 1.1)
aws-sigv2 (1.2.0)
aws-sigv4 (1.10.1)
aws-sigv4 (1.11.0)
aws-eventstream (~> 1, >= 1.0.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand Down Expand Up @@ -294,7 +294,7 @@ GEM
retryable (>= 2.0, < 4.0)
solve (~> 4.0)
thor (>= 0.20)
bigdecimal (3.1.8)
bigdecimal (3.1.9)
binding_of_caller (1.0.1)
debug_inspector (>= 1.2.0)
bson (4.15.0)
Expand Down Expand Up @@ -416,16 +416,16 @@ GEM
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-powershell (18.1.0)
ffi (~> 1.15)
ffi-yajl (~> 2.4)
chef-licensing (1.0.4)
activesupport (~> 7.0, < 7.1)
chef-config (>= 15)
faraday (>= 1, < 3)
faraday-http-cache
tty-prompt (~> 0.23)
tty-spinner (~> 0.9.3)
chef-powershell (18.1.0)
ffi (~> 1.15)
ffi-yajl (~> 2.4)
chef-telemetry (1.1.1)
chef-config
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -459,7 +459,7 @@ GEM
coderay (1.1.3)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.3.4)
concurrent-ruby (1.3.5)
connection_pool (2.4.1)
cookbook-omnifetch (0.12.2)
mixlib-archive (>= 0.4, < 2.0)
Expand Down Expand Up @@ -512,7 +512,7 @@ GEM
dry-logic (~> 1.4)
zeitwerk (~> 2.6)
ed25519 (1.3.0)
erubi (1.13.0)
erubi (1.13.1)
erubis (2.7.0)
excon (0.112.0)
faraday (1.10.4)
Expand All @@ -538,8 +538,8 @@ GEM
faraday-http-cache (2.5.1)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
Expand Down Expand Up @@ -634,7 +634,7 @@ GEM
http-cookie (1.0.8)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
inifile (3.0.0)
Expand Down Expand Up @@ -679,7 +679,7 @@ GEM
ipaddress (0.8.3)
iso8601 (0.13.0)
jmespath (1.6.2)
json (2.9.0)
json (2.9.1)
jsonpath (1.1.5)
multi_json
jwt (2.9.3)
Expand Down Expand Up @@ -741,12 +741,13 @@ GEM
rack (>= 1.6, < 4.0)
test-kitchen
vmware-vra (~> 3.0, >= 3.2.0)
knife (18.6.2)
knife (18.6.13)
bcrypt_pbkdf (~> 1.1)
chef (>= 18)
chef-config (>= 18)
chef (~> 18.6)
chef-bin (~> 18.6)
chef-config (~> 18.6)
chef-licensing (~> 1.0)
chef-utils (>= 18)
chef-utils (~> 18.6)
chef-vault
erubis (~> 2.7)
ffi (>= 1.15)
Expand Down Expand Up @@ -842,7 +843,7 @@ GEM
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1203)
mime-types-data (3.2025.0107)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitar (0.12.1)
Expand All @@ -859,16 +860,16 @@ GEM
mixlib-shellout
mixlib-versioning
thor
mixlib-log (3.1.1)
ffi (< 1.17.0)
mixlib-shellout (3.3.4)
mixlib-log (3.2.0)
ffi (~> 1.9, <= 1.17.0)
mixlib-shellout (3.3.6)
chef-utils
mixlib-shellout (3.2.8-universal-mingw32)
mixlib-shellout (3.3.6-universal-mingw32)
chef-utils
ffi-win32-extensions (~> 1.0.3)
win32-process (~> 0.9)
wmi-lite (~> 1.0)
mixlib-shellout (3.2.8-x64-mingw-ucrt)
mixlib-shellout (3.3.6-x64-mingw-ucrt)
chef-utils
ffi-win32-extensions (~> 1.0.3)
win32-process (~> 0.9)
Expand Down Expand Up @@ -905,7 +906,7 @@ GEM
net-ping (2.0.8)
net-protocol (0.2.2)
timeout
net-scp (4.0.0)
net-scp (4.1.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
Expand Down Expand Up @@ -951,14 +952,14 @@ GEM
options (2.3.2)
os (1.1.4)
parallel (1.26.3)
parser (3.3.6.0)
parser (3.3.7.0)
ast (~> 2.4.1)
racc
parslet (2.0.0)
passwordmasker (1.2.0)
pastel (0.8.0)
tty-color (~> 0.5)
plist (3.7.1)
plist (3.7.2)
progress_bar (1.3.4)
highline (>= 1.6)
options (~> 2.3.0)
Expand Down Expand Up @@ -1004,7 +1005,7 @@ GEM
rdoc (6.4.1.1)
psych (>= 4.0.0)
recursive-open-struct (1.1.3)
regexp_parser (2.9.3)
regexp_parser (2.10.0)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
Expand All @@ -1030,7 +1031,7 @@ GEM
netrc (~> 0.8)
retriable (3.1.2)
retryable (3.0.5)
rexml (3.3.9)
rexml (3.4.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
Expand All @@ -1056,13 +1057,13 @@ GEM
rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.37.0)
rubocop-ast (1.38.0)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyntlm (0.6.5)
base64
rubyzip (2.3.2)
rubyzip (2.4.1)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
Expand Down Expand Up @@ -1108,7 +1109,7 @@ GEM
time (0.4.1)
date
timeliness (0.3.10)
timeout (0.4.2)
timeout (0.4.3)
toml-rb (3.0.1)
citrus (~> 3.0, > 3.0)
racc (~> 1.7)
Expand Down Expand Up @@ -1296,8 +1297,8 @@ GEM
webrick (1.9.1)
win32-api (1.10.1)
win32-api (1.10.1-universal-mingw32)
win32-certstore (0.6.15)
chef-powershell (>= 1.0.12)
win32-certstore (0.6.16)
chef-powershell
ffi
win32-dir (0.7.2)
ffi (>= 1.0.0)
Expand Down
16 changes: 8 additions & 8 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: b97bb4e3e1319ca1c06b1a06f1f6354d3514ff51
revision: fec97fbcad50c339d4f538ca5b74cc123f627e61
branch: main
specs:
omnibus-software (24.6.323)
Expand Down Expand Up @@ -35,23 +35,23 @@ GEM
ast (2.4.2)
awesome_print (1.9.2)
aws-eventstream (1.3.0)
aws-partitions (1.1023.0)
aws-sdk-core (3.214.0)
aws-partitions (1.1043.0)
aws-sdk-core (3.217.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (1.97.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.116.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sdk-secretsmanager (1.110.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-secretsmanager (1.111.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.10.1)
aws-sigv4 (1.11.0)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
bcrypt_pbkdf (1.1.1)
Expand Down
10 changes: 5 additions & 5 deletions omnibus/config/software/habitat.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@

# DO NOT MODIFY: default_version and checksums are populated by
# workstation/.expeditor/update_habitat.sh
default_version "1.6.1041"
linux_sha = "4bd03393c0d6d71f3a915fa0f79556d3e4ab79aa3ba314c376475024436ac77e"
darwin_sha = "2dbde6139a47341d63e696014262b37958461fdaed7cfafe5e72f534bc66e40e"
darwin_m1_sha = "8d93176945a1a9094ea33ef4fd1b8f0a3a7f82c80de88bca7c3fe70c7110d16d"
windows_sha = "5e22c646eaaab1b1d6c59c99e7fbb11c63d2b6b7d825768937151e2ee38bb617"
default_version "1.6.1243"
linux_sha = "c603cc40c2d0e58b3cbb89e355669a6b54cdd109483ad3440cb00f4aad3e3684"
darwin_sha = "3b8054ee87fa08c12348bb6c661ef140dad100857f0682e84f92a6500edb3add"
darwin_m1_sha = "cf16143aab4c11e869f5f3a9d956fd2bc1e59b9094fd61e78e840235e0ab7503"
windows_sha = "56843f452dfc4d2df42404b4722c184f549e3ad8e66dc69aad1da41bfdccd209"
# END DO NOT MODIFY

if windows?
Expand Down
1 change: 1 addition & 0 deletions omnibus_overrides.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
override "util-macros", version: "1.19.0"
override "xproto", version: "7.0.28"
override "zlib", version: "1.3.1"
override "expat", version: "2.6.4"

0 comments on commit ac0875d

Please sign in to comment.