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

Fix style issues #1105

Merged
merged 1 commit into from
Jun 12, 2024
Merged

Fix style issues #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion cmd/test-bot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ class TestBotCmd < AbstractCommand
description: "Print test step output in real time. Has the side effect of " \
"passing output as raw bytes instead of re-encoding in UTF-8."
switch "--test-default-formula",
description: "Use a default testing formula when not building a tap and no other formulae are specified."
description: "Use a default testing formula when not building " \
"a tap and no other formulae are specified."
flag "--root-url=",
description: "Use the specified <URL> as the root of the bottle's URL instead of Homebrew's default."
flag "--git-name=",
Expand Down
1 change: 0 additions & 1 deletion lib/test_bot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ module TestBot

HOMEBREW_TAP_REGEX = %r{^([\w-]+)/homebrew-([\w-]+)$}


def cleanup?(args)
args.cleanup? || ENV["GITHUB_ACTIONS"].present?
end
Expand Down
12 changes: 7 additions & 5 deletions lib/tests/formulae.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ def setup_formulae_deps_instances(formula, formula_name, args:)
installed = Utils.safe_popen_read("brew", "list", "--formula", "--full-name").split("\n")
dependencies =
Utils.safe_popen_read("brew", "deps", "--formula",
"--include-build",
"--include-test",
"--full-name",
formula_name)
"--include-build",
"--include-test",
"--full-name",
formula_name)
.split("\n")
installed_dependencies = installed & dependencies
installed_dependencies.each do |name|
Expand Down Expand Up @@ -588,7 +588,9 @@ def formula!(formula_name, args:)
ensure
cleanup_bottle_etc_var(formula) if cleanup?(args)

test "brew", "uninstall", "--formulae", "--force", *@unchanged_dependencies if @unchanged_dependencies.present?
if @unchanged_dependencies.present?
test "brew", "uninstall", "--formulae", "--force", *@unchanged_dependencies
end
end

def deleted_formula!(formula_name)
Expand Down
Loading