Merge pull request #9076 from EricFromCanada/arm-arch-requirement

Add support for arm64 architecture requirement
This commit is contained in:
Mike McQuaid 2020-11-09 09:51:51 +00:00 committed by GitHub
commit 5b75133d00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 15 additions and 8 deletions

View File

@ -19,6 +19,7 @@ class ArchRequirement < Requirement
satisfy(build_env: false) do satisfy(build_env: false) do
case @arch case @arch
when :x86_64 then Hardware::CPU.intel? && Hardware::CPU.is_64_bit? when :x86_64 then Hardware::CPU.intel? && Hardware::CPU.is_64_bit?
when :arm64 then Hardware::CPU.arm? && Hardware::CPU.is_64_bit?
when :arm, :intel, :ppc then Hardware::CPU.type == @arch when :arm, :intel, :ppc then Hardware::CPU.type == @arch
end end
end end

View File

@ -1,7 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
require "cli/args"
require "extend/ENV" require "extend/ENV"
shared_examples EnvActivation do shared_examples EnvActivation do

View File

@ -1,7 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
require "cli/args"
require "requirements/java_requirement" require "requirements/java_requirement"
require "fileutils" require "fileutils"

View File

@ -1,7 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
require "cli/args"
require "extend/ENV" require "extend/ENV"
require "requirement" require "requirement"

View File

@ -0,0 +1,14 @@
# typed: false
# frozen_string_literal: true
require "requirements/arch_requirement"
describe ArchRequirement do
subject(:requirement) { described_class.new([Hardware::CPU.type]) }
describe "#satisfied?" do
it "supports architecture symbols" do
expect(requirement).to be_satisfied
end
end
end

View File

@ -1,7 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
require "cli/args"
require "requirements/java_requirement" require "requirements/java_requirement"
describe JavaRequirement do describe JavaRequirement do

View File

@ -1,7 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
require "cli/args"
require "requirements/linux_requirement" require "requirements/linux_requirement"
describe LinuxRequirement do describe LinuxRequirement do

View File

@ -1,7 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
require "cli/args"
require "requirements/macos_requirement" require "requirements/macos_requirement"
describe MacOSRequirement do describe MacOSRequirement do

View File

@ -1,7 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
require "cli/args"
require "requirements/osxfuse_requirement" require "requirements/osxfuse_requirement"
describe OsxfuseRequirement do describe OsxfuseRequirement do

View File

@ -1,7 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
require "cli/args"
require "requirements/x11_requirement" require "requirements/x11_requirement"
describe X11Requirement do describe X11Requirement do