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

Revert json v3 logic #19251

Merged
merged 4 commits into from
Feb 7, 2025
Merged

Revert json v3 logic #19251

merged 4 commits into from
Feb 7, 2025

Conversation

apainintheneck
Copy link
Contributor

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew style with your changes locally?
  • Have you successfully run brew typecheck with your changes locally?
  • Have you successfully run brew tests with your changes locally?

This reverts the JSON v3 changes made as a part of #16410 since that approach stalled and the code is not being used for anything. Homebrew/formulae.brew.sh#1704 will need to get merged in first so that we're not relying on any of the files that are being generated here.

CC: @Rylan12 as some of this logic could potentially be useful for the new approach outlined in #19204 and I don't want to disrupt that work if possible.

@MikeMcQuaid MikeMcQuaid marked this pull request as ready for review February 6, 2025 09:42
@MikeMcQuaid
Copy link
Member

Thanks @apainintheneck! Looks good when 🟢

@MikeMcQuaid MikeMcQuaid enabled auto-merge February 6, 2025 09:43
Copy link
Member

@Rylan12 Rylan12 left a comment

Choose a reason for hiding this comment

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

This all looks good. I guess it's possible that some of the code in tap.rb will end up getting added back, but tbh it's probably just better to have a clean slate and then add things back as they're actually needed. Thanks for checking though!

The `compact:` option got removed from `Cask::Cask#artifacts_list`
in 042d6cc.
@MikeMcQuaid MikeMcQuaid added this pull request to the merge queue Feb 7, 2025
@apainintheneck apainintheneck removed this pull request from the merge queue due to a manual request Feb 7, 2025
@apainintheneck
Copy link
Contributor Author

I was wondering why the tests were running so fast locally. This is my first time doing any extended development on Linux so I didn't realize that the cask tests wouldn't get run. It should be good now as the tests that failed were referencing code that got removed. I'll do a little bit more testing locally and then merge it in.

@apainintheneck
Copy link
Contributor Author

Ah, it looks like there's some more cleanup necessary of environment variables and filenames.

The logic has now been removed in previous commits. This just
removes some references to the `HOMEBREW_INTERNAL_JSON_V3`
environment variable along with reverting the changes to the
`Cachable` class that were originally added in
bd72ec8.
@apainintheneck
Copy link
Contributor Author

I tested that the formulae JSON generation is the same minus the unused JSON v3 file but I wasn't able to test the cask JSON generation locally because I'm on Linux and there are some cask loading errors related to the MacOS namespace.

@MikeMcQuaid MikeMcQuaid added this pull request to the merge queue Feb 7, 2025
Merged via the queue into master with commit 9e3ae9f Feb 7, 2025
28 checks passed
@MikeMcQuaid MikeMcQuaid deleted the revert-json-v3-logic branch February 7, 2025 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants