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

1password: migrate casks (1) #172357

Merged
merged 7 commits into from
Apr 29, 2024
Merged

1password: migrate casks (1) #172357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f29585a
1password: update conflicts
razvanazamfirei Apr 27, 2024
7d9c9c9
1password-cli: update conflicts
razvanazamfirei Apr 27, 2024
ba94a28
migrate 1password@7
razvanazamfirei Apr 27, 2024
32c04e4
migrate 1password@beta
razvanazamfirei Apr 27, 2024
8a74896
migrate 1password@nightly
razvanazamfirei Apr 27, 2024
3159f0b
migrate 1password-cli@1
razvanazamfirei Apr 27, 2024
3980305
migrate 1password-cli@beta
razvanazamfirei Apr 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: 0 additions & 2 deletions Casks/1/1password-cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
regex(%r{href=.*?/op_apple_universal[._-]v?(\d+(?:\.\d+)+)\.pkg}i)
end

conflicts_with cask: "1password-cli1"
Copy link
Member

Choose a reason for hiding this comment

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

Why do these need to be removed and not changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bevanjkay, they're added back in #172356. The conflicting casks are not resolved in CI (See, e.g., https://github.com/Homebrew/homebrew-cask/actions/runs/8863512074/job/24337653300) and this is a workaround to migrating casks individually.

Copy link
Member

@bevanjkay bevanjkay Apr 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The gather cask information step is loading the casks from the API, so even after a rebase, it would continue to fail until the API propagates.
It might be better to have a way to switch the gather cask information step to include the HOMEBREW_NO_INSTALL_FROM_API environment variable.

Can you help here @Bo98?


binary "op"

zap trash: "~/.op"
Expand Down
21 changes: 21 additions & 0 deletions Casks/1/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
cask "1password-cli@1" do
version "1.12.9"
sha256 "ff9af6a6aef58111f2279b30cebf158a2e14651176b40a649b30a12b772724a3"

url "https://cache.agilebits.com/dist/1P/op/pkg/v#{version}/op_apple_universal_v#{version}.pkg",
verified: "cache.agilebits.com/dist/1P/op/pkg/"
name "1Password CLI"
desc "Command-line helper for the 1Password password manager"
homepage "https://developer.1password.com/docs/cli/v1/usage/"

livecheck do
url "https://app-updates.agilebits.com/product_history/CLI"
regex(%r{href=.*?/op_apple_universal[._-]v?(\d+(?:\.\d+)+)\.pkg}i)
end

pkg "op_apple_universal_v#{version}.pkg"

uninstall pkgutil: "com.1password.op"

zap trash: "~/.op"
end
21 changes: 21 additions & 0 deletions Casks/1/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
cask "1password-cli@beta" do
version "2.23.0-beta.01"
sha256 "79f6b4fb2b58733c6b69a1ac9ccfb4f7255eec20a089ed29322ca93c76710856"

url "https://cache.agilebits.com/dist/1P/op2/pkg/v#{version}/op_apple_universal_v#{version}.pkg",
verified: "cache.agilebits.com/dist/1P/op2/pkg/"
name "1Password CLI"
desc "Command-line helper for the 1Password password manager"
homepage "https://developer.1password.com/docs/cli"

livecheck do
url "https://app-updates.agilebits.com/product_history/CLI2"
regex(%r{href=.*?/op_apple_universal[._-]v?(\d+(?:\.\d+)+-beta\.\d+)\.pkg}i)
end

pkg "op_apple_universal_v#{version}.pkg"

uninstall pkgutil: "com.1password.op"

zap trash: "~/.config/op"
end
4 changes: 0 additions & 4 deletions Casks/1/1password.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
end

auto_updates true
conflicts_with cask: [
"homebrew/cask-versions/1password-beta",
"homebrew/cask-versions/1password-nightly",
]
depends_on macos: ">= :catalina"

app "1Password.app"
Expand Down
27 changes: 27 additions & 0 deletions Casks/1/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
cask "1password@7" do
version "7.9.11"
sha256 "11b14910a2cf0e544e317e49f4a62491e5190545ed684236a295f51d722f30db"

url "https://c.1password.com/dist/1P/mac#{version.major}/1Password-#{version}.zip"
name "1Password"
desc "Password manager that keeps all passwords secure behind one password"
homepage "https://1password.com/"

livecheck do
url "https://app-updates.agilebits.com/product_history/OPM#{version.major}"
regex(%r{href=.*?/1Password-(\d+(?:\.\d+)+)\.pkg}i)
end

auto_updates true
depends_on macos: ">= :high_sierra"

app "1Password #{version.major}.app"

zap trash: [
"~/Library/Application Scripts/*.agilebits.onepassword*",
"~/Library/Containers/*.agilebits.onepassword*",
"~/Library/Group Containers/2BUA8C4S2C.com.agilebits",
"~/Library/Logs/1Password",
"~/Library/Preferences/com.agilebits.onepassword*",
]
end
52 changes: 52 additions & 0 deletions Casks/1/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
cask "1password@beta" do
arch arm: "aarch64", intel: "x86_64"

version "8.10.32-11.BETA"
sha256 arm: "2ab0d81dfa5529886baabc5f3acb9faf94b39d30411ffba880d338ae46c797e7",
intel: "69f2831633f793819d43a0aa37032fb3e61c06748d95a20140f048298feb7b5f"

url "https://downloads.1password.com/mac/1Password-#{version}-#{arch}.zip"
name "1Password"
desc "Password manager"
homepage "https://1password.com/"

livecheck do
url "https://app-updates.agilebits.com/product_history/OPM#{version.major}"
regex(%r{href=.*?/1Password[._-]?v?(\d+(?:.\d+)*(?:[._-]BETA))[._-]?\$ARCH\.zip}i)
end

auto_updates true
depends_on macos: ">= :catalina"

app "1Password.app"

zap trash: [
"~/Library/Application Scripts/2BUA8C4S2C.com.1password*",
"~/Library/Application Scripts/2BUA8C4S2C.com.agilebits",
"~/Library/Application Scripts/com.1password.1password-launcher",
"~/Library/Application Scripts/com.1password.browser-support",
"~/Library/Application Support/1Password",
"~/Library/Application Support/Arc/User Data/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.1password.1password.sfl*",
"~/Library/Application Support/CrashReporter/1Password*",
"~/Library/Application Support/Google/Chrome Beta/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Google/Chrome Canary/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Google/Chrome Dev/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Google/Chrome/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Microsoft Edge Beta/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Microsoft Edge Canary/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Microsoft Edge Dev/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Microsoft Edge/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Mozilla/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Application Support/Vivaldi/NativeMessagingHosts/com.1password.1password.json",
"~/Library/Containers/2BUA8C4S2C.com.1password.browser-helper",
"~/Library/Containers/com.1password.1password*",
"~/Library/Containers/com.1password.browser-support",
"~/Library/Group Containers/2BUA8C4S2C.com.1password",
"~/Library/Group Containers/2BUA8C4S2C.com.agilebits",
"~/Library/Logs/1Password",
"~/Library/Preferences/com.1password.1password.plist",
"~/Library/Preferences/group.com.1password.plist",
"~/Library/Saved Application State/com.1password.1password.savedState",
]
end
32 changes: 32 additions & 0 deletions Casks/1/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
cask "1password@nightly" do
arch arm: "aarch64", intel: "x86_64"

version :latest
sha256 :no_check

url "https://c.1password.com/dist/1P/mac8/1Password-latest.NIGHTLY-#{arch}.zip"
name "1Password Nightly"
desc "Password manager"
homepage "https://1password.com/"

depends_on macos: ">= :catalina"

app "1Password.app"

zap trash: [
"~/Library/Application Scripts/2BUA8C4S2C.com.1password",
"~/Library/Application Scripts/2BUA8C4S2C.com.1password.browser-helper",
"~/Library/Application Scripts/com.1password.1password-launcher",
"~/Library/Application Scripts/com.1password.browser-support",
"~/Library/Application Support/1Password",
"~/Library/Application Support/CrashReporter/1Password*.plist",
"~/Library/Containers/2BUA8C4S2C.com.1password.browser-helper",
"~/Library/Containers/com.1password.1password-launcher",
"~/Library/Containers/com.1password.browser-support",
"~/Library/Group Containers/*.com.1password",
"~/Library/Group Containers/*.com.agilebits",
"~/Library/Logs/DiagnosticReports/1Password*",
"~/Library/Preferences/*1password.plist",
"~/Library/Saved Application State/com.1password.1password.savedState",
]
end