Skip to content

Remove Rosetta Installer requirement via hostArchitectures fix #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timsutton wants to merge 2 commits into
base: datadog-5.5.0
Choose a base branch
from
Open

Remove Rosetta Installer requirement via hostArchitectures fix #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf9d133
Add hostArchitectures to macOS Distribution file
tduffield Mar 12, 2021
e8f6cd5
Add safe_architecture method to support cherry-picked 6173b5f
timsutton Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions lib/omnibus/packagers/pkg.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ def write_distribution_file
identifier: safe_identifier,
version: safe_version,
component_pkg: component_pkg,
host_architecture: safe_architecture,
})
end

Expand Down Expand Up @@ -253,6 +254,15 @@ def component_pkg
"#{safe_base_package_name}-core.pkg"
end

#
# Return the architecture
#
# @return [String]
#
def safe_architecture
@safe_architecture ||= Ohai["kernel"]["machine"]
end

#
# Return the PKG-ready base package name, removing any invalid characters.
#
Expand Down
2 changes: 1 addition & 1 deletion resources/pkg/distribution.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<!-- Generated by productbuild - - synthesize -->
<pkg-ref id="<%= identifier %>"/>
<options customize="never" require-scripts="false"/>
<options customize="never" require-scripts="false" hostArchitectures="<%= host_architecture %>" />
<choices-outline>
<line choice="default">
<line choice="<%= identifier %>"/>
Expand Down
16 changes: 16 additions & 0 deletions spec/unit/packagers/pkg_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,24 @@ module Omnibus

expect(contents).to include('<pkg-ref id="com.getchef.project-full-name"/>')
expect(contents).to include('<line choice="com.getchef.project-full-name"/>')
expect(contents).to include('hostArchitectures="x86_64"')
expect(contents).to include("project-full-name-core.pkg")
end

context "for arm64 builds" do
before do
stub_ohai(platform: "mac_os_x", version: "11.0") do |data|
data["kernel"]["machine"] = "arm64"
end
end

it "sets the hostArchitectures to include arm64" do
subject.write_distribution_file
contents = File.read("#{staging_dir}/Distribution")

expect(contents).to include('hostArchitectures="arm64"')
end
end
end

describe '#build_product_pkg' do
Expand Down