aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/ISSUE_TEMPLATE.md4
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--Library/Homebrew/cask/lib/hbc/installer.rb3
-rw-r--r--Library/Homebrew/cmd/prune.rb2
-rw-r--r--Library/Homebrew/dev-cmd/audit.rb4
-rw-r--r--Library/Homebrew/formula.rb4
-rw-r--r--Library/Homebrew/formulary.rb2
-rw-r--r--Library/Homebrew/os/mac/xcode.rb10
-rw-r--r--Library/Homebrew/software_spec.rb2
-rw-r--r--Library/Homebrew/test/formula_test.rb15
-rw-r--r--Library/Homebrew/test/support/fixtures/receipt.json2
-rw-r--r--Library/Homebrew/test/tab_test.rb2
-rw-r--r--Library/Homebrew/utils.rb2
-rw-r--r--docs/Acceptable-Formulae.md2
14 files changed, 29 insertions, 29 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9261857d0..d6796387e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -10,8 +10,8 @@ _You can erase any parts of this template not applicable to your Issue._
### Bug reports:
-Please replace this line with a brief summary of your issue **AND** the output of `brew config` and `brew doctor`.
+Please replace this section with a brief summary of your issue **AND** the output of `brew config` and `brew doctor`. Please note we may immediately close your issue without comment if you do not fill out the issue template and provide the requested information.
### Propose a feature:
-Instead of creating an issue here, please create a pull request with your change proposal in the [Homebrew Evolution](https://github.com/Homebrew/brew-evolution) repository using the [proposal template](https://github.com/Homebrew/brew-evolution/blob/master/proposal_template.md).
+Please replace this section with a detailed description of your proposed feature, the motivation for it and alternatives considered. Please note we may close this issue or ask you to create a pull-request if it's something we're not actively planning to work on.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ebfc9b04..a2924fce1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,10 +6,10 @@ First time contributing to Homebrew? Read our [Code of Conduct](https://github.c
* run `brew update` (twice)
* run and read `brew doctor`
* read [the Troubleshooting Checklist](https://github.com/Homebrew/brew/blob/master/docs/Troubleshooting.md#troubleshooting)
-* open an issue on the formula's repository
+* open an issue on the formula's repository or on Homebrew/brew if it's not a formula-specific issue
### Propose a feature
-* Please create a pull request with your change proposal in the [Homebrew Evolution](https://github.com/Homebrew/brew-evolution) repository using the [proposal template](https://github.com/Homebrew/brew-evolution/blob/master/proposal_template.md).
+* open an issue with a detailed description of your proposed feature, the motivation for it and alternatives considered. Please note we may close this issue or ask you to create a pull-request if this is not something we see as sufficiently high priority.
Thanks!
diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/lib/hbc/installer.rb
index 5176143d7..3875e1c8f 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/lib/hbc/installer.rb
@@ -146,14 +146,13 @@ module Hbc
end
rescue StandardError => e
begin
- ofail e.message
already_installed_artifacts.each do |artifact|
odebug "Reverting installation of artifact of class #{artifact}"
artifact.new(@cask, options).uninstall_phase
end
ensure
purge_versioned_files
- raise e.class, "An error occured during installation of Cask #{@cask}: #{e.message}"
+ raise e
end
end
diff --git a/Library/Homebrew/cmd/prune.rb b/Library/Homebrew/cmd/prune.rb
index e2e6d77b8..9fc6dbcd9 100644
--- a/Library/Homebrew/cmd/prune.rb
+++ b/Library/Homebrew/cmd/prune.rb
@@ -35,7 +35,7 @@ module Homebrew
path.unlink
end
end
- elsif path.directory?
+ elsif path.directory? && !Keg::PRUNEABLE_DIRECTORIES.include?(path)
dirs << path
end
end
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index ee03c01ac..0112c524f 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -1000,6 +1000,10 @@ class FormulaAuditor
problem "Use Language::Node for npm install args"
end
+ if line.include?("fails_with :llvm")
+ problem "'fails_with :llvm' is now a no-op so should be removed"
+ end
+
return unless @strict
if line =~ /system ((["'])[^"' ]*(?:\s[^"' ]*)+\2)/
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index e1846424f..b3927d260 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1505,7 +1505,7 @@ class Formula
# Returns a list of Dependency objects that are required at runtime.
# @private
def runtime_dependencies
- recursive_dependencies { |_, dep| Dependency.prune if dep.build? }
+ recursive_dependencies.reject(&:build?)
end
# Returns a list of formulae depended on by this formula that aren't
@@ -2340,6 +2340,8 @@ class Formula
# version '4.8.1'
# end</pre>
def fails_with(compiler, &block)
+ # TODO: deprecate this in future.
+ # odeprecated "fails_with :llvm" if compiler == :llvm
specs.each { |spec| spec.fails_with(compiler, &block) }
end
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 6ed5b91ba..90e0dc2d4 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -211,7 +211,7 @@ class Formulary
def load_file
super
rescue MethodDeprecatedError => e
- e.issues_url = formula.tap.issues_url || formula.tap.to_s
+ e.issues_url = tap.issues_url || tap.to_s
raise
end
end
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 724bc8fe2..bc1d66ef8 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -15,13 +15,13 @@ module OS
when "10.8" then "5.1.1"
when "10.9" then "6.2"
when "10.10" then "7.2.1"
- when "10.11" then "8.1"
- when "10.12" then "8.1"
+ when "10.11" then "8.2"
+ when "10.12" then "8.2"
else
raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease?
# Default to newest known version of Xcode for unreleased macOS versions.
- "8.1"
+ "8.2"
end
end
@@ -37,8 +37,8 @@ module OS
end
def prerelease?
- # TODO: bump to version >= "8.3" after Xcode 8.2 is stable.
- Version.new(version) >= "8.2"
+ # TODO: bump to version >= "8.4" after Xcode 8.3 is stable.
+ Version.new(version) >= "8.3"
end
def outdated?
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index de19ce544..0c230f643 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -173,6 +173,8 @@ class SoftwareSpec
end
def fails_with(compiler, &block)
+ # TODO: deprecate this in future.
+ # odeprecated "fails_with :llvm" if compiler == :llvm
compiler_failures << CompilerFailure.create(compiler, &block)
end
diff --git a/Library/Homebrew/test/formula_test.rb b/Library/Homebrew/test/formula_test.rb
index 28d376b7c..a6db1b57f 100644
--- a/Library/Homebrew/test/formula_test.rb
+++ b/Library/Homebrew/test/formula_test.rb
@@ -651,19 +651,12 @@ class FormulaTests < Homebrew::TestCase
f4 = formula("f4") do
url "f4-1.0"
- depends_on "f1"
+ depends_on "f3"
end
- stub_formula_loader f4
- f5 = formula("f5") do
- url "f5-1.0"
- depends_on "f3" => :build
- depends_on "f4"
- end
-
- assert_equal %w[f3 f4], f5.deps.map(&:name)
- assert_equal %w[f1 f2 f3 f4], f5.recursive_dependencies.map(&:name)
- assert_equal %w[f1 f4], f5.runtime_dependencies.map(&:name)
+ assert_equal %w[f3], f4.deps.map(&:name)
+ assert_equal %w[f1 f2 f3], f4.recursive_dependencies.map(&:name)
+ assert_equal %w[f2 f3], f4.runtime_dependencies.map(&:name)
end
def test_to_hash
diff --git a/Library/Homebrew/test/support/fixtures/receipt.json b/Library/Homebrew/test/support/fixtures/receipt.json
index 404251026..b20626bbe 100644
--- a/Library/Homebrew/test/support/fixtures/receipt.json
+++ b/Library/Homebrew/test/support/fixtures/receipt.json
@@ -25,7 +25,7 @@
}
],
"source": {
- "path": "/usr/local/Library/Taps/hombrew/homebrew-core/Formula/foo.rb",
+ "path": "/usr/local/Library/Taps/homebrew/homebrew-core/Formula/foo.rb",
"tap": "homebrew/core",
"spec": "stable",
"versions": {
diff --git a/Library/Homebrew/test/tab_test.rb b/Library/Homebrew/test/tab_test.rb
index ef653103c..5d83b5907 100644
--- a/Library/Homebrew/test/tab_test.rb
+++ b/Library/Homebrew/test/tab_test.rb
@@ -105,7 +105,7 @@ class TabTests < Homebrew::TestCase
def test_from_file
path = Pathname.new("#{TEST_FIXTURE_DIR}/receipt.json")
tab = Tab.from_file(path)
- source_path = "/usr/local/Library/Taps/hombrew/homebrew-core/Formula/foo.rb"
+ source_path = "/usr/local/Library/Taps/homebrew/homebrew-core/Formula/foo.rb"
runtime_dependencies = [{ "full_name" => "foo", "version" => "1.0" }]
changed_files = %w[INSTALL_RECEIPT.json bin/foo]
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 89a90bed2..4ad97c7d4 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -300,7 +300,7 @@ def which(cmd, path = ENV["PATH"])
end
def which_all(cmd, path = ENV["PATH"])
- path.split(File::PATH_SEPARATOR).map do |p|
+ path.to_s.split(File::PATH_SEPARATOR).map do |p|
begin
pcmd = File.expand_path(cmd, p)
rescue ArgumentError
diff --git a/docs/Acceptable-Formulae.md b/docs/Acceptable-Formulae.md
index 15e800336..b827403d8 100644
--- a/docs/Acceptable-Formulae.md
+++ b/docs/Acceptable-Formulae.md
@@ -58,7 +58,7 @@ point it to the downloaded archive in order to avoid loading.
### We don’t like binary formulae
Our policy is that formulae in the core repository
([homebrew/core](https://github.com/Homebrew/homebrew-core)) must be open-source
-and either built from source or produce cross-platform binaries like e.g. Java).
+and either built from source or produce cross-platform binaries (like e.g. Java).
Binary-only formulae should go to
[Homebrew Cask](https://github.com/caskroom/homebrew-cask).
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-02 01:06:43 +0000