Merge pull request #122 from OpenVoxProject/macos_in_gha

Changes to enable building all MacOS types on any MacOS host

Author: nmburgan

.github/workflows/build.yml

@@ -18,12 +18,33 @@ on:
         description: 'A comma-separated list of platforms to build for. Do not include spaces. If not provided, will use the default list of platform supported by OpenVox.'
         required: false
         type: string
+      vanagon_branch:
+        description: 'The branch of the vanagon repository to use'
+        required: false
+        type: string
+        default: 'main'
+      use_dev:
+        description: 'Use the "dev" branch of the shared-actions repo'
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build:
+    if: ${{ github.event.inputs.use_dev == 'false' }}
     uses: 'openvoxproject/shared-actions/.github/workflows/build_vanagon.yml@main'
     with:
       ref: ${{ inputs.ref }}
       project_name: ${{ inputs.project_name }}
       platform_list: ${{ inputs.platform_list }}
+      vanagon_branch: ${{ inputs.vanagon_branch }}
+    secrets: inherit
+  build_dev:
+    if: ${{ github.event.inputs.use_dev == 'true' }}
+    uses: 'openvoxproject/shared-actions/.github/workflows/build_vanagon.yml@dev'
+    with:
+      ref: ${{ inputs.ref }}
+      project_name: ${{ inputs.project_name }}
+      platform_list: ${{ inputs.platform_list }}
+      vanagon_branch: ${{ inputs.vanagon_branch }}
     secrets: inherit

acceptance/lib/puppet/acceptance/temp_file_utils.rb

@@ -19,7 +19,7 @@ def root_group(host)
           'Administrators'
         when /aix/
           'system'
-        when /osx|bsd/
+        when /macos|bsd/
           'wheel'
         else
           'root'

acceptance/teardown/common/099_Archive_Logs.rb

@@ -85,7 +85,7 @@ def file_glob(host, path)
             @logger.log_level = previous_level
             on(host, 'egrep -i \'reboot after panic\' /var/adm/messages', :acceptable_exit_codes => [0,1,2])
             @logger.log_level = :warn
-          elsif host[:platform] =~ /osx/
+          elsif host[:platform] =~ /macos/
             syslog_name = "system.log"
           elsif host[:platform] =~ /fedora/
             on(host, "journalctl --no-pager > /var/log/messages")

acceptance/tests/ensure_macos_executables_are_signed.rb

@@ -1,5 +1,5 @@
 test_name 'Ensure puppet executables are codesigned on mac OS' do
-  confine :to, :platform => /osx/
+  confine :to, :platform => /macos/
   tag 'audit:high'
 
   agents.each do |agent|

acceptance/tests/validate_vendored_ruby.rb

@@ -65,7 +65,7 @@ def setup_build_environment(agent)
 end
 
 def install_dependencies(agent)
-  return if agent['platform'] =~ /osx|solaris-11|sparc/
+  return if agent['platform'] =~ /macos|solaris-11|sparc/
 
   install_package_on_agent = package_installer(agent)
   dependencies = {

configs/components/_base-module.rb

@@ -46,6 +46,6 @@
     # Rename appropriately for use with puppet
     "mv #{module_author}-#{module_name} #{target_directory}",
     # Remove git and CI-related files
-    "rm -r #{File.join(target_directory, '.[!.]*')} 2>/dev/null",
+    "rm -rf #{File.join(target_directory, '.[!.]*')}",
   ]
 end

configs/components/pl-ruby-patch.rb

@@ -16,7 +16,7 @@
     ruby_api_version = settings[:ruby_version].gsub(/\.\d*$/, '.0')
     ruby_version_y = settings[:ruby_version].gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')
 
-    base_ruby = if platform.name =~ /osx/
+    base_ruby = if platform.name =~ /macos/
                   "/usr/local/opt/ruby@#{ruby_version_y}/lib/ruby/#{ruby_api_version}"
                 else
                   "/opt/pl-build-tools/lib/ruby/2.1.0"

configs/components/puppet.rb

@@ -85,7 +85,7 @@
       msgfmt = "/usr/bin/msgfmt.exe"
     elsif platform.is_macos?
       msgfmt = "/usr/local/opt/gettext/bin/msgfmt"
-      if platform.architecture == 'arm64' && platform.os_version.to_i >= 13
+      if platform.architecture == 'arm64'
         msgfmt = "/opt/homebrew/bin/msgfmt"
       end
     else

configs/platforms/macos-all-arm64.rb

@@ -0,0 +1,12 @@
+platform 'macos-all-arm64' do |plat|
+  plat.inherit_from_default
+  packages = %w[cmake pkg-config yaml-cpp]
+  # We uninstall in case they are already installed, since GitHub Actions runners
+  # will already have their own version and we want the homebrew core version.
+  # We do || true so it doesn't fail if the packages don't exist. We have to do
+  # it one by one because brew will not process the rest if one doesn't exist.
+  packages.each do |pkg|
+    plat.provision_with "brew uninstall #{pkg} 2>/dev/null || true && brew install #{pkg}"
+  end
+  plat.output_dir File.join('macos', 'all', 'arm64')
+end

configs/platforms/macos-all-x86_64.rb

@@ -0,0 +1,4 @@
+platform 'macos-all-x86_64' do |plat|
+  plat.inherit_from_default
+  plat.output_dir File.join('macos', 'all', 'x86_64')
+end