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.

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

Update teamviewer from 15.26.4 to 15.26.5 #118326

Merged
merged 3 commits into from
Feb 2, 2022

Conversation

owine
Copy link
Contributor

@owine owine commented Jan 28, 2022

Created with brew bump-cask-pr.

@BrewTestBot BrewTestBot added the bump-cask-pr PR was created using `brew bump-cask-pr` label Jan 28, 2022
chenrui333
chenrui333 previously approved these changes Jan 30, 2022
@miccal
Copy link
Member

miccal commented Jan 30, 2022

Ping @carlocab.

The CI tests for Catalina are now failing, which is to be expected, but this is a way to deal with the issues raised in #118316.

@miccal miccal added awaiting maintainer feedback Issue needs response from a maintainer. and removed bump-cask-pr PR was created using `brew bump-cask-pr` labels Jan 30, 2022
@miccal miccal requested a review from carlocab February 2, 2022 03:33
carlocab
carlocab previously approved these changes Feb 2, 2022
Copy link
Member

@carlocab carlocab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me, but we should find a way to avoid this failing in CI.

@miccal
Copy link
Member

miccal commented Feb 2, 2022

I am not sure how we could that -- can we somehow make it so the CI tests are not run on 10.15 and only run on 11.0?

@carlocab
Copy link
Member

carlocab commented Feb 2, 2022

A really dirty hack might be to do this instead:

diff --git a/Casks/teamviewer.rb b/Casks/teamviewer.rb
index 63adb4d948..2c048092bb 100644
--- a/Casks/teamviewer.rb
+++ b/Casks/teamviewer.rb
@@ -23,7 +23,11 @@ cask "teamviewer" do
 
   auto_updates true
   conflicts_with cask: "teamviewer-host"
-  depends_on macos: ">= :el_capitan"
+  if MacOS.version == :catalina
+    depends_on macos: ">= :big_sur"
+  else
+    depends_on macos: ">= :el_capitan"
+  end
 
   if MacOS.version <= :high_sierra
     pkg "Install TeamViewer.pkg"

Might still fail CI though.

Otherwise we can probably modify our runner-selection script, but I'd like to keep any hacks out of there ideally.

@BrewTestBot BrewTestBot added the bump-cask-pr PR was created using `brew bump-cask-pr` label Feb 2, 2022
@miccal
Copy link
Member

miccal commented Feb 2, 2022

@carlocab how about this?

Comment on lines +30 to +33
elsif MacOS.version == :catalina
# This Cask should be installed and uninstalled manually on Catalina.
# See https://github.com/Homebrew/homebrew-cask/issues/76829
installer manual: "Install TeamViewer.app/Contents/Resources/Install TeamViewer.pkg"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much better! Thanks, @miccal

@miccal miccal merged commit 73fa651 into Homebrew:master Feb 2, 2022
@miccal miccal removed the awaiting maintainer feedback Issue needs response from a maintainer. label Feb 2, 2022
@owine owine deleted the bump-teamviewer-15.26.5 branch February 2, 2022 04:53
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bump-cask-pr PR was created using `brew bump-cask-pr` outdated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants