Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

w*: Fix Homebrew/NoFileutilsRmrf RuboCop offenses #178713

Merged
merged 6 commits into from
Jul 28, 2024
Merged

w*: Fix Homebrew/NoFileutilsRmrf RuboCop offenses #178713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52eb1a7
walkmod: Fix `Homebrew/NoFileutilsRmrf` RuboCop offenses
issyl0 Jul 27, 2024
65fe918
watchman: Fix `Homebrew/NoFileutilsRmrf` RuboCop offenses
issyl0 Jul 27, 2024
57368df
web-ext: Fix `Homebrew/NoFileutilsRmrf` RuboCop offenses
issyl0 Jul 27, 2024
96cd050
webtorrent-cli: Fix `Homebrew/NoFileutilsRmrf` RuboCop offenses
issyl0 Jul 27, 2024
2141cdb
whistle: Fix `Homebrew/NoFileutilsRmrf` RuboCop offenses
issyl0 Jul 27, 2024
5f6699b
wxwidgets: Fix `Homebrew/NoFileutilsRmrf` RuboCop offenses
issyl0 Jul 27, 2024
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 Formula/w/walkmod.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Walkmod < Formula

def install
# Remove windows files
rm_f Dir["bin/*.bat"]
rm(Dir["bin/*.bat"])
libexec.install Dir["*"]
(bin/"walkmod").write_env_script libexec/"bin/walkmod", JAVA_HOME: Formula["openjdk"].opt_prefix
end
Expand Down
2 changes: 1 addition & 1 deletion Formula/w/watchman.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Watchman < Formula

Check notice on line 1 in Formula/w/watchman.rb

View workflow job for this annotation

GitHub Actions / macOS 12-arm64

Installed previously built bottle for watchman from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check notice on line 1 in Formula/w/watchman.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Installed previously built bottle for watchman from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check notice on line 1 in Formula/w/watchman.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Installed previously built bottle for watchman from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check warning on line 1 in Formula/w/watchman.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

`brew linkage --cached --test --strict watchman` failed on macOS Ventura (13) on Apple Silicon! 

Indirect dependencies with linkage:
  double-conversion
  fizz
  libsodium
  lz4
  mvfst
  snappy
  wangle
  xz
  zstd

Check notice on line 1 in Formula/w/watchman.rb

View workflow job for this annotation

GitHub Actions / Linux

Installed previously built bottle for watchman from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check warning on line 1 in Formula/w/watchman.rb

View workflow job for this annotation

GitHub Actions / macOS 13-x86_64

`brew linkage --cached --test --strict watchman` failed on macOS Ventura (13)! 

Indirect dependencies with linkage:
  double-conversion
  fizz
  libsodium
  lz4
  mvfst
  snappy
  wangle
  xz
  zstd
desc "Watch files and take action when they change"
homepage "https://github.com/facebook/watchman"
url "https://github.com/facebook/watchman/archive/refs/tags/v2024.07.15.00.tar.gz"
Expand Down Expand Up @@ -72,7 +72,7 @@
path = Pathname.new(File.join(prefix, HOMEBREW_PREFIX))
bin.install (path/"bin").children
lib.install (path/"lib").children
path.rmtree
rm_r(path)
end

def post_install
Expand Down
2 changes: 1 addition & 1 deletion Formula/w/web-ext.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "language/node"

Check notice on line 1 in Formula/w/web-ext.rb

View workflow job for this annotation

GitHub Actions / macOS 12-arm64

Installed previously built bottle for web-ext from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check notice on line 1 in Formula/w/web-ext.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Installed previously built bottle for web-ext from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check notice on line 1 in Formula/w/web-ext.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Installed previously built bottle for web-ext from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check notice on line 1 in Formula/w/web-ext.rb

View workflow job for this annotation

GitHub Actions / Linux

Installed previously built bottle for web-ext from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

class WebExt < Formula
desc "Command-line tool to help build, run, and test web extensions"
Expand Down Expand Up @@ -29,7 +29,7 @@

# Remove vendored pre-built binary `terminal-notifier`
node_notifier_vendor_dir = libexec/"lib/node_modules/web-ext/node_modules/node-notifier/vendor"
node_notifier_vendor_dir.rmtree # remove vendored pre-built binaries
rm_r(node_notifier_vendor_dir) # remove vendored pre-built binaries

if OS.mac?
terminal_notifier_dir = node_notifier_vendor_dir/"mac.noindex"
Expand Down
2 changes: 1 addition & 1 deletion Formula/w/webtorrent-cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "language/node"

Check notice on line 1 in Formula/w/webtorrent-cli.rb

View workflow job for this annotation

GitHub Actions / macOS 12-arm64

Installed previously built bottle for webtorrent-cli from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check notice on line 1 in Formula/w/webtorrent-cli.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Installed previously built bottle for webtorrent-cli from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check notice on line 1 in Formula/w/webtorrent-cli.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Installed previously built bottle for webtorrent-cli from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check notice on line 1 in Formula/w/webtorrent-cli.rb

View workflow job for this annotation

GitHub Actions / Linux

Installed previously built bottle for webtorrent-cli from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

class WebtorrentCli < Formula
desc "Command-line streaming torrent client"
Expand Down Expand Up @@ -30,7 +30,7 @@
os = OS.kernel_name.downcase
arch = Hardware::CPU.intel? ? "x64" : Hardware::CPU.arch.to_s
libexec.glob("lib/node_modules/webtorrent-cli/node_modules/{bufferutil,utp-native,utf-8-validate}/prebuilds/*")
.each { |dir| dir.rmtree if dir.basename.to_s != "#{os}-#{arch}" }
.each { |dir| rm_r(dir) if dir.basename.to_s != "#{os}-#{arch}" }

# Replace universal binaries with their native slices
deuniversalize_machos
Expand Down
4 changes: 0 additions & 4 deletions Formula/w/whistle.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ class Whistle < Formula
def install
system "npm", "install", *Language::Node.std_npm_install_args(libexec)
bin.install_symlink Dir["#{libexec}/bin/*"]

# Remove x86 specific optional feature
node_modules = libexec/"lib/node_modules/whistle/node_modules"
rm_f node_modules/"set-global-proxy/lib/mac/whistle" if Hardware::CPU.arm?
end

test do
Expand Down
4 changes: 2 additions & 2 deletions Formula/w/wxwidgets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Wxwidgets < Formula

Check notice on line 1 in Formula/w/wxwidgets.rb

View workflow job for this annotation

GitHub Actions / macOS 12-arm64

Installed previously built bottle for wxwidgets from 

:5c5aae14548 (Merge cba2da07554b6287386bbb2d89f60b184facebc0 into 1de45b9a72489c3926686ec093b1dd807715d6dc, 2024-07-27)

Check warning on line 1 in Formula/w/wxwidgets.rb

View workflow job for this annotation

GitHub Actions / Linux

`brew linkage --cached --test --strict wxwidgets` failed on Linux! 

Indirect dependencies with linkage:
  cairo
  fontconfig
  gdk-pixbuf
  glib
  libx11
  libxkbcommon
  libxtst
  libxxf86vm
  mesa
  pango
  wayland
desc "Cross-platform C++ GUI toolkit"
homepage "https://www.wxwidgets.org"
url "https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.5/wxWidgets-3.2.5.tar.bz2"
Expand Down Expand Up @@ -38,8 +38,8 @@

def install
# Remove all bundled libraries excluding `nanosvg` which isn't available as formula
%w[catch pcre].each { |l| (buildpath/"3rdparty"/l).rmtree }
%w[expat jpeg png tiff zlib].each { |l| (buildpath/"src"/l).rmtree }
%w[catch pcre].each { |l| rm_r(buildpath/"3rdparty"/l) }
%w[expat jpeg png tiff zlib].each { |l| rm_r(buildpath/"src"/l) }

args = [
"--prefix=#{prefix}",
Expand Down
Loading