Merge pull request #2364 from skyamgarp/PA-4777

(PA-4777) Add macOS 13 (ARM) platform definition to puppet-agent
puppetlabs · Jul 19, 2023 · 831889b · 831889b
2 parents 1c5c2d6 + 471a028
commit 831889b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/configs/components/puppet.rb b/configs/components/puppet.rb
@@ -112,6 +112,9 @@
       msgfmt = "/cygdrive/c/tools/pl-build-tools/bin/msgfmt.exe"
     elsif platform.is_macos?
       msgfmt = "/usr/local/opt/gettext/bin/msgfmt"
+      if platform.architecture == 'arm64' && platform.os_version.to_i >= 13
+        msgfmt = "/opt/homebrew/bin/msgfmt"
+      end
     elsif platform.is_aix?
       msgfmt = "/opt/pl-build-tools/bin/msgfmt"
     else

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