Merge pull request #3820 from sjackman/macos-version

Define OS::Mac on Linux
This commit is contained in:
Mike McQuaid 2018-02-21 09:48:36 +00:00 committed by GitHub
commit 09c5be86b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 11 deletions

View File

@ -36,22 +36,13 @@ before_install:
mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library";
sudo rm -rf "$HOMEBREW_REPOSITORY";
sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY";
else
HOMEBREW_CORE_TAP_DIR="$(brew --repo "homebrew/core")";
mkdir -p "$HOMEBREW_CORE_TAP_DIR";
fi
- if [ "$MACOS" ]; then
travis_retry git -C Library/Taps/homebrew/homebrew-core fetch --depth=1 origin;
else
travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-core Library/Taps/homebrew/homebrew-core;
fi
- travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot
- if [ "$LINUX" ]; then
HOMEBREW_TEST_BOT_TAP_DIR="$(brew --repo "homebrew/test-bot")";
ln -s "$HOMEBREW_TEST_BOT_TAP_DIR/.git" "$HOMEBREW_TEST_BOT_TAP_DIR/Formula" "$HOMEBREW_CORE_TAP_DIR";
fi
# can be removed after 1.5.3 is tagged
- if [ "$LINUX" ]; then
export HOMEBREW_FORCE_VENDOR_RUBY=1;
fi
script:
- brew test-bot

View File

@ -21,6 +21,7 @@ module OS
end
PATH_OPEN = "/usr/bin/open".freeze
elsif OS.linux?
require "os/linux"
ISSUES_URL = "https://github.com/Linuxbrew/brew/wiki/troubleshooting".freeze
PATH_OPEN = "xdg-open".freeze
end

View File

@ -0,0 +1,28 @@
module OS
# Define OS::Mac on Linux for formula API compatibility.
module Mac
module_function
::MacOS = self # rubocop:disable Naming/ConstantName
def prefer_64_bit?
Hardware::CPU.is_64_bit?
end
def version
Version::NULL
end
def full_version
Version::NULL
end
module Xcode
module_function
def version
Version::NULL
end
end
end
end