From 471a02868bb327cb13f62d15db974dd8c9955562 Mon Sep 17 00:00:00 2001 From: skyamgarp <130442619+skyamgarp@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:24:32 +0530 Subject: [PATCH] (PA-4777) Add macOS 13 (ARM) platform definition to puppet-agent --- configs/components/puppet.rb | 3 +++ configs/platforms/osx-13-arm64.rb | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 configs/platforms/osx-13-arm64.rb diff --git a/configs/components/puppet.rb b/configs/components/puppet.rb index 88a75a5e82..f604151d54 100644 --- 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 new file mode 100644 index 0000000000..1d7a74d1b7 --- /dev/null +++ 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