Skip to content

Commit

Permalink
Merge branch 'Homebrew:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
KingSkybax authored Feb 12, 2024
2 parents 4b6733b + eb7338a commit 1481dd4
Show file tree
Hide file tree
Showing 301 changed files with 11,614 additions and 17,487 deletions.
5 changes: 0 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ trim_trailing_whitespace = true
# trailing whitespace is crucial for patches
trim_trailing_whitespace = false

[**.drawio.svg]
indent_size = unset
indent_style = unset
insert_final_newline = false

[**.md]
trim_trailing_whitespace = true
x-soft-wrap-text = true
5 changes: 4 additions & 1 deletion .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
self-hosted-runner:
# Labels of self-hosted runner in array of strings.
labels: []
labels:
# TODO: technically not a self-hosted runner but avoids errors until a new
# version of actionlint is released.
- macos-14
# Configuration variables in array of strings defined in your repository or
# organization. `null` means disabling configuration variables check.
# Empty array means no configuration variable is allowed.
Expand Down
2 changes: 1 addition & 1 deletion .github/maintainers.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["Moisan","MikeMcQuaid","singingwolfboy","issyl0","dtrodrigues","dduugg","bayandin","Bo98","reitermarkus","SMillerDev","chenrui333","samford","fxcoudert","EricFromCanada","iMichka","alebcay","miccal","razvanazamfirei","branchvincent","gdams","cho-m","ZhongRuoyu","carlocab","Rylan12","nandahkrishna","krehel","bevanjkay","apainintheneck","p-linnane"]
["Moisan","timsutton","MikeMcQuaid","singingwolfboy","issyl0","dtrodrigues","dduugg","bayandin","Bo98","reitermarkus","SMillerDev","chenrui333","samford","fxcoudert","EricFromCanada","iMichka","alebcay","miccal","razvanazamfirei","branchvincent","gdams","cho-m","ZhongRuoyu","carlocab","Rylan12","nandahkrishna","krehel","bevanjkay","apainintheneck","p-linnane"]
4 changes: 4 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ jobs:
working-directory: ${{ steps.set-up-homebrew.outputs.repository-path }}/docs
run: bundle exec rake lint

- name: Check code blocks conform to our Ruby style guide
working-directory: ${{ steps.set-up-homebrew.outputs.repository-path }}/docs
run: brew style .

- name: Build the site and check for broken links
working-directory: ${{ steps.set-up-homebrew.outputs.repository-path }}/docs
run: |
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/pkg-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,8 @@ jobs:
- runner: macos-13
name: macos-13-x86_64
# Apple Silicon
- runner: macos-13-xlarge
name: macos-13-arm64
# TODO: add when available
# - runner: macos-14
# name: macos-14-x86_64
# - runner: macos-14-xlarge
# name: macos-14-arm64
- runner: macos-14
name: macos-14-arm64
steps:
- name: Download installer from GitHub Actions
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sorbet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ permissions:
jobs:
tapioca:
if: github.repository == 'Homebrew/brew'
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
name: cask audit
needs: syntax
if: github.repository_owner == 'Homebrew'
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
- name: update-test (Ubuntu 22.04)
runs-on: ubuntu-22.04
- name: update-test (macOS 13)
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down Expand Up @@ -305,9 +305,12 @@ jobs:
- name: tests (Ubuntu 20.04)
test-flags: --coverage
runs-on: ubuntu-20.04
- name: tests (macOS 13)
- name: tests (macOS 13 x86_64)
test-flags: --coverage
runs-on: macos-13
- name: tests (macOS 14 arm64)
test-flags: --coverage
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down Expand Up @@ -389,7 +392,7 @@ jobs:
HOMEBREW_BUILDPULSE_ACCOUNT_ID: 1503512
HOMEBREW_BUILDPULSE_REPOSITORY_ID: 53238813

- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0
- uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044
with:
root_dir: ${{ steps.set-up-homebrew.outputs.repository-path }}
files: Library/Homebrew/test/coverage/coverage.xml
Expand All @@ -406,8 +409,10 @@ jobs:
runs-on: ubuntu-22.04
- name: test default formula (Ubuntu 20.04)
runs-on: ubuntu-20.04
- name: test default formula (macOS 13)
- name: test default formula (macOS 13 x86_64)
runs-on: macos-13
- name: test default formula (macOS 14 arm64)
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vendor-gems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
contains(github.event.pull_request.title, '/Library/Homebrew')
)
)
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
/Library/Taps
/Library/PinnedTaps
/Library/Homebrew/.byebug_history
/Library/Homebrew/sorbet/rbi/hidden-definitions/errors.txt

# Ignore Bundler files
**/.bundle/bin
Expand Down
11 changes: 8 additions & 3 deletions Library/.rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
require:
- ./Homebrew/rubocops.rb
- rubocop-md
- rubocop-performance
- rubocop-rspec
- rubocop-sorbet
Expand All @@ -17,7 +18,6 @@ AllCops:
- "**/*.rbi"
Exclude:
- "Homebrew/sorbet/rbi/gems/**/*.rbi"
- "Homebrew/sorbet/rbi/hidden-definitions/*.rbi"
- "Homebrew/bin/*"
- "Homebrew/vendor/**/*"
- "Taps/*/*/vendor/**/*"
Expand Down Expand Up @@ -68,6 +68,7 @@ Homebrew/NegateInclude:
# `exclude?` is not available here:
- "Homebrew/standalone/init.rb"
- "Homebrew/rubocops/**/*"
- "Homebrew/sorbet/tapioca/**/*"

# `system` is a special case and aligns on second argument, so allow this for formulae.
Layout/ArgumentAlignment:
Expand Down Expand Up @@ -214,6 +215,10 @@ Performance/CaseWhenSplat:
Performance/MethodObjectAsBlock:
Enabled: false

RSpec:
Include:
- 'Homebrew/test/**/*'

# Intentionally disabled as it doesn't fit with our code style.
RSpec/AnyInstance:
Enabled: false
Expand Down Expand Up @@ -373,7 +378,7 @@ Style/NumericLiterals:

Style/OpenStructUse:
Exclude:
- "Taps/**/*.rb"
- "Taps/**/*"
# TODO: This is a pre-existing violation and should be corrected
# to define methods so that call sites can be type-checked.
- "Homebrew/cli/args.rb"
Expand Down Expand Up @@ -426,7 +431,7 @@ Style/TernaryParentheses:
Style/TopLevelMethodDefinition:
Enabled: true
Exclude:
- "Taps/**/*.rb"
- "Taps/**/*"

# Trailing commas make diffs nicer.
Style/TrailingCommaInArguments:
Expand Down
1 change: 1 addition & 0 deletions Library/Homebrew/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Style/Documentation:
- livecheck/strategy/apache.rb
- livecheck/strategy/bitbucket.rb
- livecheck/strategy/cpan.rb
- livecheck/strategy/crate.rb
- livecheck/strategy/extract_plist.rb
- livecheck/strategy/git.rb
- livecheck/strategy/github_latest.rb
Expand Down
2 changes: 2 additions & 0 deletions Library/Homebrew/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ group :pry, optional: true do
end
group :style, optional: true do
gem "rubocop", require: false
gem "rubocop-md", require: false
gem "rubocop-performance", require: false
gem "rubocop-rspec", require: false
gem "rubocop-sorbet", require: false
Expand All @@ -59,6 +60,7 @@ group :tests, optional: true do
gem "simplecov-cobertura", require: false
end
group :typecheck, optional: true do
gem "method_source", require: false
gem "parlour", require: false
gem "sorbet-static-and-runtime", require: false
gem "spoom", require: false
Expand Down
58 changes: 31 additions & 27 deletions Library/Homebrew/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ GEM
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
bindata (2.4.15)
bootsnap (1.17.1)
bootsnap (1.18.3)
msgpack (~> 1.2)
byebug (11.1.3)
coderay (1.1.3)
commander (4.6.0)
highline (~> 2.0.0)
diff-lcs (1.5.0)
diff-lcs (1.5.1)
docile (1.4.0)
elftools (1.2.0)
bindata (~> 2)
Expand All @@ -26,12 +26,12 @@ GEM
simpleidn (~> 0.2)
language_server-protocol (3.17.0.3)
method_source (1.0.0)
minitest (5.21.2)
minitest (5.22.2)
msgpack (1.7.2)
mustache (1.1.1)
netrc (0.11.0)
parallel (1.24.0)
parallel_tests (4.4.0)
parallel_tests (4.5.0)
parallel
parlour (8.1.0)
commander (~> 4.5)
Expand All @@ -45,15 +45,15 @@ GEM
elftools (>= 1.2)
plist (3.7.1)
prettier_print (1.2.1)
prism (0.19.0)
prism (0.21.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.4)
racc (1.7.3)
rainbow (3.1.1)
rbi (0.1.6)
prism (>= 0.18.0, < 0.20)
rbi (0.1.8)
prism (>= 0.18.0, < 0.22)
sorbet-runtime (>= 0.5.9204)
rdiscount (2.2.7.3)
regexp_parser (2.9.0)
Expand All @@ -62,28 +62,28 @@ GEM
hpricot (>= 0.8.2)
mustache (>= 0.7.0)
rdiscount (>= 1.5.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (~> 3.13.0)
rspec-github (2.4.0)
rspec-core (~> 3.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.12.6)
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (~> 3.13.0)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-sorbet (1.9.2)
sorbet-runtime
rspec-support (3.12.1)
rspec-support (3.13.0)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.60.2)
Expand All @@ -103,14 +103,16 @@ GEM
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
rubocop (~> 1.41)
rubocop-md (1.2.2)
rubocop (>= 1.0)
rubocop-performance (1.20.2)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rspec (2.26.1)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
rubocop-sorbet (0.7.6)
rubocop-sorbet (0.7.7)
rubocop (>= 0.90.0)
ruby-macho (4.0.0)
ruby-prof (1.7.0)
Expand All @@ -126,14 +128,14 @@ GEM
simplecov_json_formatter (0.1.4)
simpleidn (0.2.1)
unf (~> 0.1.4)
sorbet (0.5.11221)
sorbet-static (= 0.5.11221)
sorbet-runtime (0.5.11221)
sorbet-static (0.5.11221-universal-darwin)
sorbet-static (0.5.11221-x86_64-linux)
sorbet-static-and-runtime (0.5.11221)
sorbet (= 0.5.11221)
sorbet-runtime (= 0.5.11221)
sorbet (0.5.11247)
sorbet-static (= 0.5.11247)
sorbet-runtime (0.5.11247)
sorbet-static (0.5.11247-universal-darwin)
sorbet-static (0.5.11247-x86_64-linux)
sorbet-static-and-runtime (0.5.11247)
sorbet (= 0.5.11247)
sorbet-runtime (= 0.5.11247)
spoom (1.2.4)
erubi (>= 1.10.0)
sorbet-static-and-runtime (>= 0.5.10187)
Expand Down Expand Up @@ -174,6 +176,7 @@ DEPENDENCIES
bootsnap
byebug
json_schemer
method_source
minitest
parallel_tests
parlour
Expand All @@ -190,6 +193,7 @@ DEPENDENCIES
rspec_junit_formatter
rubocop
rubocop-ast
rubocop-md
rubocop-performance
rubocop-rspec
rubocop-sorbet
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/api/cask.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def download_and_cache_data!
end
private :download_and_cache_data!

sig { returns(Hash) }
sig { returns(T::Hash[String, Hash]) }
def all_casks
unless cache.key?("casks")
json_updated = download_and_cache_data!
Expand Down
3 changes: 3 additions & 0 deletions Library/Homebrew/cask/artifact/abstract_uninstall.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@
require "cask/artifact/abstract_artifact"
require "cask/pkg"
require "extend/hash/keys"
require "system_command"

module Cask
module Artifact
# Abstract superclass for uninstall artifacts.
#
# @api private
class AbstractUninstall < AbstractArtifact
include SystemCommand::Mixin

ORDERED_DIRECTIVES = [
:early_script,
:launchctl,
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/cask/artifact/qlplugin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Artifact
class Qlplugin < Moved
sig { returns(String) }
def self.english_name
"QuickLook Plugin"
"Quick Look Plugin"
end

def install_phase(**options)
Expand Down
Loading

0 comments on commit 1481dd4

Please sign in to comment.