Skip to content

Commit e3b8e25

Browse files
authored
Merge pull request #15 from OpenVoxProject/macos
Add MacOS 15
2 parents 755fca2 + c6f81a0 commit e3b8e25

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"location":"https://s3.osuosl.org/openvox-artifacts/puppet-runtime/202502203/","version":"202502203"}
1+
{"location":"https://s3.osuosl.org/openvox-artifacts/puppet-runtime/202502261/","version":"202502261"}

configs/components/pxp-agent.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"location":"https://s3.osuosl.org/openvox-artifacts/pxp-agent/202502201/","version":"202502201"}
1+
{"location":"https://s3.osuosl.org/openvox-artifacts/pxp-agent/202502262/","version":"202502262"}

configs/platforms/osx-15-arm64.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
platform 'osx-15-arm64' do |plat|
2+
plat.inherit_from_default
3+
packages = %w[cmake pkg-config yaml-cpp]
4+
plat.provision_with "su test -c '/opt/homebrew/bin/brew install #{packages.join(' ')}'"
5+
plat.output_dir File.join('apple', '15', 'puppet8', 'arm64')
6+
end

tasks/build.rake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ namespace :vox do
1414
abort 'You must provide a platform.' if args[:platform].nil? || args[:platform].empty?
1515
platform = args[:platform]
1616

17-
cmd = "bundle exec build #{project} #{platform} --engine docker"
17+
engine = platform =~ /^osx-/ ? 'local' : 'docker'
18+
cmd = "bundle exec build #{project} #{platform} --engine #{engine}"
19+
1820
puts "Running #{cmd}"
1921
exitcode = nil
20-
2122
Open3.popen2e(cmd) do |_stdin, stdout_stderr, thread|
2223
stdout_stderr.each { |line| puts line }
2324
exitcode = thread.value.exitstatus

0 commit comments

Comments
 (0)