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

Move all remaining casks to sharded subdirectories. #152603

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Move all remaining casks to sharded subdirectories. #152603

merged 1 commit into from
Aug 9, 2023
+0 −0

Conversation

MikeMcQuaid
Copy link
Member

@MikeMcQuaid MikeMcQuaid commented Aug 9, 2023 •
edited
Loading

The migration of orka.rb and then o*.rb has worked well without complaint so: let's move everything else, too.

Homebrew/brew#15847 should be merged shortly after this PR is.

@MikeMcQuaid
Move all remaining casks to sharded subdirectories.
aa46114 
The migration of `orka.rb` and then `o*.rb` has worked well without
complaint so: let's move everything else, too.
@MikeMcQuaid MikeMcQuaid added the ci-syntax-only Only run syntax checks on CI. Use only for bulk changes. label Aug 9, 2023
@MikeMcQuaid MikeMcQuaid requested a review from a team August 9, 2023 11:09
@bevanjkay
Copy link
Member

@MikeMcQuaid Do we have any tests ready for this for when new casks are added, or will it be a check that will be carried out manually for now?

@MikeMcQuaid MikeMcQuaid mentioned this pull request Aug 9, 2023
Merged
@MikeMcQuaid
Copy link
Member Author

@bevanjkay Given the lack of any issues for orka.rb or o*.rb: I do not expect any issues here but feel free to revert if there are any. The main issue I can see is that open PRs may need to be rebased.

@SMillerDev
Copy link
Member

I'm more worried that nobody spots a PR outside it's sharded directory.

@MikeMcQuaid MikeMcQuaid merged commit 5f483d2 into Homebrew:master Aug 9, 2023
11 checks passed
@MikeMcQuaid
Copy link
Member Author

I'm more worried that nobody spots a PR outside it's sharded directory.

Good call, that'd be a good basic CI test to add: fail if there's any files (rather than directories) in Casks.

@MikeMcQuaid MikeMcQuaid deleted the shard_all branch August 9, 2023 11:55
@p-linnane p-linnane mentioned this pull request Aug 9, 2023
Closed
9 tasks
@sloanlance
Copy link

brew info still tells me that the cask formulae come from /Casks rather than a sharded directory. For example…

$ brew update
Already up-to-date.

$ brew --version
Homebrew 4.1.4
Homebrew/homebrew-core (git revision 4794352ddb6; last commit 2023-08-09)
Homebrew/homebrew-cask (git revision 79c5820bf9; last commit 2023-08-09)

$ brew info calibre
==> calibre: 6.24.0
https://calibre-ebook.com/
/Users/lsloan/homebrew/Caskroom/calibre/6.24.0 (134B)
From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/calibre.rb
==> Name
calibre
==> Description
E-books management software
==> Artifacts
calibre.app (App)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/calibre (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/calibre-complete (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/calibre-customize (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/calibre-debug (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/calibre-parallel (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/calibre-server (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/calibre-smtp (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/calibredb (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/ebook-convert (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/ebook-device (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/ebook-meta (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/ebook-polish (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/ebook-viewer (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/fetch-ebook-metadata (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/lrf2lrs (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/lrfviewer (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/lrs2lrf (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/markdown-calibre (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/web2disk (Binary)
/Users/lsloan/Applications/calibre.app/Contents/MacOS/ebook-edit (Binary)
==> Analytics
install: 1,461 (30 days), 6,297 (90 days), 9,285 (365 days)

$

Note that it's "From:" https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/calibre.rb. However, if I follow that link, I get an HTTP 404 error page. If I add /c to the URL, then it works. See https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/c/calibre.rb.

I tried to reinstall the cask, but it made no difference.

Should I open an issue about this?

@MikeMcQuaid
Copy link
Member Author

Note that it's "From:" https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/calibre.rb. However, if I follow that link, I get an HTTP 404 error page. If I add /c to the URL, then it works. See https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/c/calibre.rb.

Should I open an issue about this?

Yes, please!

@razvanazamfirei razvanazamfirei mentioned this pull request Aug 9, 2023
Merged
7 tasks
ZhongRuoyu added a commit to ZhongRuoyu/formulae.brew.sh that referenced this pull request Aug 10, 2023
@ZhongRuoyu
Fix cask code URL
8c0355e 
This is needed after Homebrew/homebrew-cask#152603.

Fixes https://github.com/orgs/Homebrew/discussions/4704.
@ZhongRuoyu ZhongRuoyu mentioned this pull request Aug 10, 2023
Merged
ZhongRuoyu added a commit to ZhongRuoyu/formulae.brew.sh that referenced this pull request Aug 10, 2023
@ZhongRuoyu
Fix cask code URL
325314c 
This is needed after Homebrew/homebrew-cask#152603.

Fixes https://github.com/orgs/Homebrew/discussions/4704.
ldennington added a commit to ldennington/update-homebrew that referenced this pull request Aug 10, 2023
@ldennington
homebrew-cask: update according to new sharding
c86843c 
Update to correctly publish casks to homebrew/homebrew-cask
based on sharding [1].

[1]: Homebrew/homebrew-cask#152603
@ldennington ldennington mentioned this pull request Aug 10, 2023
Merged
ldennington added a commit to ldennington/update-homebrew that referenced this pull request Aug 10, 2023
@ldennington
homebrew-cask: update according to new sharding
d13730e 
Update to correctly publish casks to homebrew/homebrew-cask
based on sharding [1].

[1]: Homebrew/homebrew-cask#152603
ldennington added a commit to ldennington/update-homebrew that referenced this pull request Aug 10, 2023
@ldennington
homebrew-cask: update according to new sharding
2c0bf45 
Update to correctly publish casks to homebrew/homebrew-cask
based on sharding [1].

[1]: Homebrew/homebrew-cask#152603
ldennington added a commit to ldennington/update-homebrew that referenced this pull request Aug 10, 2023
@ldennington
homebrew-cask: update according to new sharding
7a5dcd3 
Update to correctly publish casks to homebrew/homebrew-cask
based on sharding [1].

[1]: Homebrew/homebrew-cask#152603
ldennington added a commit to ldennington/update-homebrew that referenced this pull request Aug 10, 2023
@ldennington
homebrew-cask: update according to new sharding
765b597 
Update to correctly publish casks to homebrew/homebrew-cask
based on sharding [1].

[1]: Homebrew/homebrew-cask#152603
ldennington added a commit to ldennington/update-homebrew that referenced this pull request Aug 10, 2023
@ldennington
homebrew-cask: update according to new sharding
e7ea105 
Update to correctly publish casks to homebrew/homebrew-cask
based on sharding [1].

[1]: Homebrew/homebrew-cask#152603
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bevanjkay bevanjkay bevanjkay approved these changes

Assignees
No one assigned
Labels
automerge-skip ci-syntax-only Only run syntax checks on CI. Use only for bulk changes. outdated
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@MikeMcQuaid @bevanjkay @SMillerDev @sloanlance @BrewTestBot