Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/actionlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
path: results.sarif

- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
uses: github/codeql-action/upload-sarif@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
with:
sarif_file: results.sarif
category: zizmor
2 changes: 1 addition & 1 deletion .github/workflows/autogenerated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
test-bot: true

- name: Cache Bundler RubyGems
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ steps.set-up-homebrew.outputs.gems-path }}
key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
persist-credentials: false

- name: Initialize CodeQL
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
uses: github/codeql-action/init@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
with:
languages: ruby
config: |
paths-ignore:
- Library/Homebrew/vendor

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
uses: github/codeql-action/analyze@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: vale docs/

- name: Install Ruby
uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0
with:
bundler-cache: true
working-directory: docs
Expand All @@ -70,7 +70,7 @@ jobs:
run: ../script/generate-api-samples.rb --template

- name: Cache HTML Proofer
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: tmp/.htmlproofer
key: ${{ runner.os }}-htmlproofer
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubydoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
persist-credentials: false

- name: Install Ruby
uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0
with:
bundler-cache: true
working-directory: rubydoc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sponsors-maintainers-man-completions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
signing_key: ${{ secrets.BREWTESTBOT_SSH_SIGNING_KEY }}

- name: Cache Bundler RubyGems
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ steps.set-up-homebrew.outputs.gems-path }}
key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
test-bot: false

- name: Cache Bundler RubyGems
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ steps.set-up-homebrew.outputs.gems-path }}
key: ${{ runner.os }}-rubygems-syntax-${{ steps.set-up-homebrew.outputs.gems-hash }}
Expand All @@ -53,7 +53,7 @@ jobs:
run: brew install shellcheck shfmt

- name: Cache style cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ~/.cache/Homebrew/style
key: syntax-style-cache-${{ github.sha }}
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
test-bot: true

- name: Cache Bundler RubyGems
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ steps.set-up-homebrew.outputs.gems-path }}
key: ${{ runner.os }}-rubygems-tap-syntax-${{ steps.set-up-homebrew.outputs.gems-hash }}
Expand All @@ -102,7 +102,7 @@ jobs:
run: brew install-bundler-gems --groups=style

- name: Cache style cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ~/Library/Caches/Homebrew/style
key: tap-syntax-style-cache-${{ github.sha }}
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
test-bot: false

- name: Cache Bundler RubyGems
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ steps.set-up-homebrew.outputs.gems-path }}
key: ${{ matrix.runs-on }}-tests-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
Expand All @@ -275,7 +275,7 @@ jobs:
run: mkdir tests

- name: Cache parallel tests log
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: tests
key: ${{ runner.os }}-${{ matrix.test-flags }}-parallel_runtime_rspec-${{ github.sha }}
Expand Down Expand Up @@ -499,7 +499,7 @@ jobs:

- name: Cache Homebrew Bundler RubyGems
id: cache
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ steps.set-up-homebrew.outputs.gems-path }}
key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
Expand Down
26 changes: 13 additions & 13 deletions Library/Homebrew/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GEM
bindata (~> 2)
erubi (1.13.1)
hana (1.3.7)
json (2.14.1)
json (2.15.0)
json_schemer (2.4.0)
bigdecimal
hana (~> 1.3)
Expand Down Expand Up @@ -79,18 +79,18 @@ GEM
rspec-support (3.13.6)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.80.2)
rubocop (1.81.0)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.46.0, < 2.0)
rubocop-ast (>= 1.47.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.46.0)
rubocop-ast (1.47.1)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-md (2.0.2)
Expand Down Expand Up @@ -124,15 +124,15 @@ GEM
simplecov-html (0.13.2)
simplecov_json_formatter (0.1.4)
simpleidn (0.2.3)
sorbet (0.6.12550)
sorbet-static (= 0.6.12550)
sorbet-runtime (0.6.12550)
sorbet-static (0.6.12550-aarch64-linux)
sorbet-static (0.6.12550-universal-darwin)
sorbet-static (0.6.12550-x86_64-linux)
sorbet-static-and-runtime (0.6.12550)
sorbet (= 0.6.12550)
sorbet-runtime (= 0.6.12550)
sorbet (0.6.12578)
sorbet-static (= 0.6.12578)
sorbet-runtime (0.6.12578)
sorbet-static (0.6.12578-aarch64-linux)
sorbet-static (0.6.12578-universal-darwin)
sorbet-static (0.6.12578-x86_64-linux)
sorbet-static-and-runtime (0.6.12578)
sorbet (= 0.6.12578)
sorbet-runtime (= 0.6.12578)
spoom (1.7.6)
erubi (>= 1.10.0)
prism (>= 0.28.0)
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/cask/macos.rb
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ module Mac
"/var/spool/mail",
"/var/tmp",
]
.to_set { Pathname(_1) }
.to_set { |path| Pathname(path) }
.freeze, T::Set[Pathname])
private_constant :SYSTEM_DIRS

Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/cask/pkg.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def pkgutil_bom_all
.stdout
.split("\n")
.map { |path| root.join(path) }
.reject { MacOS.undeletable?(_1) }
.reject { |path| MacOS.undeletable?(path) }
end

sig { returns(Pathname) }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/cleanup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def unremovable_kegs

def cleanup_formula(formula, quiet: false, ds_store: true, cache_db: true)
formula.eligible_kegs_for_cleanup(quiet:)
.each { cleanup_keg(_1) }
.each { |keg| cleanup_keg(keg) }
cleanup_cache(Pathname.glob(cache/"#{formula.name}{_bottle_manifest,}--*").map { |path| { path:, type: nil } })
rm_ds_store([formula.rack]) if ds_store
cleanup_cache_db(formula.rack) if cache_db
Expand Down
6 changes: 3 additions & 3 deletions Library/Homebrew/cmd/leaves.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ def run
CaskDependent.new(cask).runtime_dependencies.map(&:to_formula)
end
leaves_list -= casks_runtime_dependencies
leaves_list.select! { installed_on_request?(_1) } if args.installed_on_request?
leaves_list.select! { installed_as_dependency?(_1) } if args.installed_as_dependency?
leaves_list.select! { |leaf| installed_on_request?(leaf) } if args.installed_on_request?
leaves_list.select! { |leaf| installed_as_dependency?(leaf) } if args.installed_as_dependency?

leaves_list.map(&:full_name)
.sort
.each { puts(_1) }
.each { |leaf| puts(leaf) }
end

private
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/commands.rb
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,14 @@ def self.internal_commands_aliases

def self.find_internal_commands(path)
find_commands(path).map(&:basename)
.map { basename_without_extension(_1) }
.map { |basename| basename_without_extension(basename) }
.uniq
end

def self.external_commands
tap_cmd_directories.flat_map do |path|
find_commands(path).select(&:executable?)
.map { basename_without_extension(_1) }
.map { |basename| basename_without_extension(basename) }
.map { |p| p.to_s.delete_prefix("brew-").strip }
end.map(&:to_s)
.sort
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/formula_installer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@ def fetch_dependencies

unless download_queue
dependencies_string = deps.map(&:first)
.map { Formatter.identifier(_1) }
.map { |dep| Formatter.identifier(dep) }
.to_sentence
oh1 "Fetching dependencies for #{formula.full_name}: #{dependencies_string}",
truncate: false
Expand Down
Loading
Loading