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

Fix homebrew tap name handling #9546

Merged
merged 5 commits into from
Jan 13, 2025
Merged

Fix homebrew tap name handling #9546

merged 5 commits into from
Jan 13, 2025

Conversation

UnknownPlatypus
Copy link
Contributor

SUMMARY

Fixes #9533

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

homebrew

@ansibullbot
Copy link
Collaborator

cc @Akasurde @andrew-d @danieljaouen @indrajitr @kyleabenson @martinm82
click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug integration tests/integration module module needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR plugins plugin (any type) tests tests labels Jan 7, 2025
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch labels Jan 7, 2025
@ansibullbot ansibullbot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Jan 9, 2025
@felixfontein
Copy link
Collaborator

If nobody objects, I'll merge this in a few days.

@UnknownPlatypus @felixfontein
Fix tests/integration/targets/homebrew/tasks/formulae.yml
f76656e 
Co-authored-by: Felix Fontein <felix@fontein.de>
@UnknownPlatypus UnknownPlatypus force-pushed the fix-homebrew-tap-name-handling branch from 06c0192 to f76656e Compare January 11, 2025 14:59
@UnknownPlatypus
Copy link
Contributor Author

(I've just added the missing newline at the end of the yaml file)

russoz
russoz approved these changes Jan 12, 2025
View reviewed changes
Copy link
Collaborator

@russoz russoz left a comment

Choose a reason for hiding this comment

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

LGTM

cdayjr added a commit to cdayjr/dotfiles that referenced this pull request Jan 13, 2025
@cdayjr
Remove full tap package paths due to bug
f3af503 
ansible-collections/community.general#9546
@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Jan 13, 2025
@felixfontein felixfontein merged commit 114deae into ansible-collections:main Jan 13, 2025
138 checks passed
@patchback Patchback
Copy link

patchback bot commented Jan 13, 2025 •
edited
Loading

Backport to stable-9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 114deae on top of patchback/backports/stable-9/114deae3e460f7901f80e23609bd240557648200/pr-9546

Backporting merged PR #9546 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it: 
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/stable-9/114deae3e460f7901f80e23609bd240557648200/pr-9546 upstream/stable-9
  4. Now, cherry-pick PR Fix homebrew tap name handling #9546 contents into that branch: 
    $ git cherry-pick -x 114deae3e460f7901f80e23609bd240557648200
    If it'll yell at you with something like fatal: Commit 114deae3e460f7901f80e23609bd240557648200 is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x 114deae3e460f7901f80e23609bd240557648200
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix homebrew tap name handling #9546 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-9/114deae3e460f7901f80e23609bd240557648200/pr-9546
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback Patchback
Copy link

patchback bot commented Jan 13, 2025 •
edited
Loading

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/114deae3e460f7901f80e23609bd240557648200/pr-9546

Backported as #9569

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein
Copy link
Collaborator

@UnknownPlatypus thanks for your contribution!
@russoz thanks for reviewing!

patchback bot pushed a commit that referenced this pull request Jan 13, 2025
@UnknownPlatypus @patchback
Fix homebrew tap name handling (#9546)
51533ae 
* Add failing test

* Use fully qualified names

* Add changelog fragment

* Remove unnecessary initial cleanup

* Fix tests/integration/targets/homebrew/tasks/formulae.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 114deae)
@patchback patchback bot mentioned this pull request Jan 13, 2025
Merged
felixfontein pushed a commit that referenced this pull request Jan 13, 2025
@patchback @UnknownPlatypus
[PR #9546/114deae3 backport][stable-10] Fix homebrew tap name handling (
2314db5 
#9569)

Fix homebrew tap name handling (#9546)

* Add failing test

* Use fully qualified names

* Add changelog fragment

* Remove unnecessary initial cleanup

* Fix tests/integration/targets/homebrew/tasks/formulae.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 114deae)

Co-authored-by: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
@cdayjr cdayjr mentioned this pull request Jan 27, 2025
Closed
1 task
@UnknownPlatypus UnknownPlatypus deleted the fix-homebrew-tap-name-handling branch February 1, 2025 10:29
Massl123 pushed a commit to Massl123/community.general that referenced this pull request Feb 7, 2025
@UnknownPlatypus @felixfontein @Massl123
Fix homebrew tap name handling (ansible-collections#9546)
a0e9611 
* Add failing test

* Use fully qualified names

* Add changelog fragment

* Remove unnecessary initial cleanup

* Fix tests/integration/targets/homebrew/tasks/formulae.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein left review comments

@russoz russoz russoz approved these changes

Assignees
No one assigned
Labels
backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch bug This issue/PR relates to a bug integration tests/integration module module plugins plugin (any type) tests tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

homebrew: state 'latest' fails when name is using brew full_name
4 participants
@UnknownPlatypus @ansibullbot @felixfontein @russoz