Remove yaml-cpp from macOS provisioning

In May 2018, commit fd8c9e4 added yaml-cpp as a component to the agent-runtime-master project. In Oct 2018, commit bc865b3 installed yaml-cpp using homebrew for agent 5.5.x on macOS 10.12. This means yaml-cpp headers are present in /usr/local/include and take precedence over our component. This drops yaml-cpp from brew install, which ensures we're compiling against the correct yaml-cpp headers in our component.
puppetlabs · May 7, 2024 · ef8d7e9 · ef8d7e9
1 parent 89d1403
commit ef8d7e9
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/configs/platforms/osx-11-arm64.rb b/configs/platforms/osx-11-arm64.rb
@@ -1,7 +1,7 @@
 platform 'osx-11-arm64' do |plat|
   plat.inherit_from_default
 
-  packages = %w[cmake pkg-config yaml-cpp]
+  packages = %w[cmake pkg-config]
   plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '11', 'PC1', 'arm64')

diff --git a/configs/platforms/osx-11-x86_64.rb b/configs/platforms/osx-11-x86_64.rb
@@ -1,7 +1,7 @@
 platform 'osx-11-x86_64' do |plat|
   plat.inherit_from_default
 
-  packages = %w[cmake pkg-config yaml-cpp]
+  packages = %w[cmake pkg-config]
   plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '11', 'PC1', 'x86_64')

diff --git a/configs/platforms/osx-12-arm64.rb b/configs/platforms/osx-12-arm64.rb
@@ -1,7 +1,7 @@
 platform 'osx-12-arm64' do |plat|
   plat.inherit_from_default
 
-  packages = %w[automake cmake pkg-config yaml-cpp]
+  packages = %w[automake cmake pkg-config]
   plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '12', 'PC1', 'arm64')

diff --git a/configs/platforms/osx-12-x86_64.rb b/configs/platforms/osx-12-x86_64.rb
@@ -1,7 +1,7 @@
 platform 'osx-12-x86_64' do |plat|
   plat.inherit_from_default
 
-  packages = %w[cmake pkg-config yaml-cpp]
+  packages = %w[cmake pkg-config]
   plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '12', 'PC1', 'x86_64')

diff --git a/configs/platforms/osx-13-arm64.rb b/configs/platforms/osx-13-arm64.rb
@@ -1,7 +1,7 @@
 platform 'osx-13-arm64' do |plat|
   plat.inherit_from_default
 
-  packages = %w[automake cmake pkg-config yaml-cpp]
+  packages = %w[automake cmake pkg-config]
   plat.provision_with "su test -c '/opt/homebrew/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '13', 'PC1', 'arm64')

diff --git a/configs/platforms/osx-13-x86_64.rb b/configs/platforms/osx-13-x86_64.rb
@@ -1,7 +1,7 @@
 platform 'osx-13-x86_64' do |plat|
   plat.inherit_from_default
 
-  packages = %w[cmake pkg-config yaml-cpp]
+  packages = %w[cmake pkg-config]
   plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '13', 'PC1', 'x86_64')

diff --git a/configs/platforms/osx-14-arm64.rb b/configs/platforms/osx-14-arm64.rb
@@ -1,7 +1,7 @@
 platform 'osx-14-arm64' do |plat|
   plat.inherit_from_default
 
-  packages = %w[automake cmake pkg-config yaml-cpp]
+  packages = %w[automake cmake pkg-config]
   plat.provision_with "su test -c '/opt/homebrew/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '14', 'PC1', 'arm64')

diff --git a/configs/platforms/osx-14-x86_64.rb b/configs/platforms/osx-14-x86_64.rb
@@ -1,7 +1,7 @@
 platform 'osx-14-x86_64' do |plat|
   plat.inherit_from_default
 
-  packages = %w[cmake pkg-config yaml-cpp]
+  packages = %w[cmake pkg-config]
   plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '14', 'PC1', 'x86_64')