Merge pull request #2366 from skyamgarp/PA-4777-main

(PA-5667) Add macOS 13 (ARM) platform definition to puppet-agent
puppetlabs · Jul 19, 2023 · b085dce · b085dce
2 parents dc2a49c + b3aa58d
commit b085dce
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
@@ -93,6 +93,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
     else
       msgfmt = "msgfmt"
     end

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', 'puppet8', 'arm64')
+end