diff options
author | John McCrae <john.mccrae@progress.com> | 2022-05-08 01:10:00 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-08 01:10:00 -0700 |
commit | 6cc1a631890b2db22c0293aa3880a3bb6183d264 (patch) | |
tree | 07998e3d269b13ccd6160a89f0fd3086a17e50bf | |
parent | ef95b7dd0e1d77d89020aaaa8cd4598b2d0cd2d8 (diff) | |
parent | c1f5e7b6439d406b313de80b54c871ae81187f62 (diff) | |
download | chef-6cc1a631890b2db22c0293aa3880a3bb6183d264.tar.gz |
Merge pull request #12837 from chef/dependabot/bundler/omnibus/main/berkshelf-8.0.0
-rw-r--r-- | cspell.json | 2 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/macos.rb | 30 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 14 |
3 files changed, 39 insertions, 7 deletions
diff --git a/cspell.json b/cspell.json index 7a40dd82ba..c83ca74074 100644 --- a/cspell.json +++ b/cspell.json @@ -1311,6 +1311,7 @@ "TBYTE", "TCBS", "TCHAR", + "tempadmin", "tempcron", "tempdir", "Tempfile", @@ -1472,6 +1473,7 @@ "whatinstalled", "whatprovides", "whereis", + "whoami", "willem", "WINAPI", "winbase", diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb index 213ef2d516..0f5174d487 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb @@ -66,6 +66,36 @@ chef_client_launchd "Every 30 mins Infra Client run" do action :enable end +### Begin MacOS nonsense +# What you see below here is a pile of crazy. +# The End-To-End recipe wants to update git on MacOS to the latest version. +# MacOS doesn't like this. We get back symlink update errors, et al +# We then have to use this to take control of enough of the OS +# to update git without actually hurting anything else. UGH + +file "/usr/local/var/homebrew/locks/git@2.35.1.formula.lock" do + mode "0777" + owner "root" +end + +file "/usr/local/Cellar/git@2.35.1/2.35.1/etc/bash_completion.d/git-completion.bash" do + mode "0777" + owner "root" +end + +execute "changing ownership of the git cask" do + command "chmod -R 777 /usr/local/Cellar/git@2.35.1" + live_stream true +end + +execute "Sledge Hammer removal of the offending Git version" do + command "rm -rf /usr/local/Cellar/git@2.35.1" + live_stream true +end + +### End MacOS nonsense +# Now back to your regularly scheduled build, now in progress. + include_recipe "git" # test various archive formats in the archive_file resource diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b997062eea..a7d79f38ee 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -33,8 +33,8 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.578.0) - aws-sdk-core (3.130.1) + aws-partitions (1.581.0) + aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -42,19 +42,19 @@ GEM aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) + aws-sdk-s3 (1.113.2) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.59.0) + aws-sdk-secretsmanager (1.60.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0-x64-mingw32) bcrypt_pbkdf (1.1.0-x86-mingw32) - berkshelf (7.2.2) + berkshelf (8.0.0) chef (>= 15.7.32) chef-config cleanroom (~> 1.0) @@ -210,7 +210,7 @@ GEM hashie (4.1.0) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.56.19) + inspec-core (4.56.20) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) |