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

bump-revision: fixes for new style and license dsl #8139

Merged
merged 2 commits into from Jul 30, 2020
Merged

bump-revision: fixes for new style and license dsl #8139

merged 2 commits into from Jul 30, 2020

Conversation

Rylan12
Copy link
Member

@Rylan12 Rylan12 commented Jul 30, 2020

  • 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 tests with your changes locally?

After #7953, formula.license returns an array even when only one license is specified. This PR adds logic to check whether there is more than one license and formats the license line appropriately.

Additionally, #7867 changed the style for revision from :revision => "..." to revision: "...". This PR also handles that.

@Rylan12
bump-revision: handle array of licenses
1ac470f 
Allowing multiple licenses meant that `formula.license` returned an
array. This converts that array to the appropriate format for
`bump-revision`
@Rylan12
bump-revision: update revision syntax
bdc8438
@Rylan12 Rylan12 mentioned this pull request Jul 30, 2020
Closed
3 tasks
MikeMcQuaid
MikeMcQuaid approved these changes Jul 30, 2020
View reviewed changes
Copy link
Member

@MikeMcQuaid MikeMcQuaid left a comment

Choose a reason for hiding this comment

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

Assuming you've tested locally for both paths and it works as expected: :shipit:! Thanks @Rylan12!

@Rylan12
Copy link
Member Author

Rylan12 commented Jul 30, 2020

I think I've covered everything:

  • qt: no license line
  • vim: single license
  • vim (modified): multiple licenses (none exist in homebrew-core yet so I just added a fake one)
  • volt: no license line and has a revision: "..." line

@Rylan12 Rylan12 merged commit f4f4d91 into Homebrew:master Jul 30, 2020
@Rylan12 Rylan12 deleted the bump-revision-fix branch July 30, 2020 16:21
@scpeters scpeters mentioned this pull request Sep 12, 2020
Merged
6 tasks
@BrewTestBot BrewTestBot added the outdated PR was locked due to age label Dec 21, 2020
@Homebrew Homebrew locked as resolved and limited conversation to collaborators Dec 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@MikeMcQuaid MikeMcQuaid MikeMcQuaid approved these changes

Assignees
No one assigned
Labels
outdated PR was locked due to age
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Rylan12 @MikeMcQuaid @BrewTestBot