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

Preserve aliases information from merged packages #196

Merged
merged 1 commit into from
Aug 22, 2022
Merged

Preserve aliases information from merged packages #196

merged 1 commit into from
Aug 22, 2022

Conversation

jiripudil
Copy link
Contributor

fixes #100

@reedy
Copy link
Member

reedy commented Jan 9, 2021

You might want to rebase your patch so CI doesn't error :)

@jiripudil
Copy link
Contributor Author

Good point, rebased onto #189. Should I mark this PR as a draft so that it doesn't get merged accidentally?

@jiripudil
Copy link
Contributor Author

Also, on a side note, would you appreciate a PR migrating over to Github Actions? To my dismay, waiting for Travis feels like ages recently.

@reedy
Copy link
Member

reedy commented Jan 10, 2021

Also, on a side note, would you appreciate a PR migrating over to Github Actions? To my dismay, waiting for Travis feels like ages recently.

Could do.

I was planning on doing the same thing when I got a little bit more time this weekend, as it's not particularly difficult to do :).

Fixing CI (forcing composer 1.x) as I did was only a couple of minute job, so was easily done in the meantime.

@reedy
Copy link
Member

reedy commented Jan 10, 2021

Also, on a side note, would you appreciate a PR migrating over to Github Actions? To my dismay, waiting for Travis feels like ages recently.

Started on https://github.com/wikimedia/composer-merge-plugin/tree/githubactions

@jiripudil
Copy link
Contributor Author

Lovely, thank you! Rebased onto master. The development is suddenly a breeze when you get almost instant feedback from the CI :)

@XedinUnknown
Copy link

XedinUnknown commented May 14, 2021

Hi! Since this seems to have been fixed some time ago, and tests are passing, what is blocking the merge please? I would like to use Composer's resolution for my modules if they declare the same dep as root package. In my case, the module needs to depend on a fix branch of the same dep that is required with a more stable constraint in the root. If the module was a dependency, this would be trivial to solve with inline aliasing. Alas, it does not work. I'm really hoping this PR could fix this.

Also, it would be great if 1.x would receive this fix, as many are still on Composer 1.

@sajphon
Copy link

sajphon commented Jun 4, 2021

Tested the PR locally and it seems to do exactly what it claims to do and I didnt run into any issues while using it. This should be merged asap.

@XedinUnknown
Copy link

This comment seems to imply that the changes of this PR are included in the master branch. If it has, I guess it has been released? What's the version with this change, please? Since it's a rebase and not a merge, this information is not available.

@reedy
Copy link
Member

reedy commented Jun 8, 2021

This comment seems to imply that the changes of this PR are included in the master branch. If it has, I guess it has been released? What's the version with this change, please? Since it's a rebase and not a merge, this information is not available.

No it doesn't. It was originally against master before we had GitHub actions. It was rebased onto newer master when we had GitHub actions, so CI actually worked properly.

@sajphon
Copy link

sajphon commented Jun 14, 2021

@reedy so what seems to be the problem with releasing it ? 🤔

@XedinUnknown
Copy link

Any news on this, please?

@sajphon
Copy link

sajphon commented Mar 3, 2022

@reedy any news ?

edit: How is this still not merged ?

@utrotzek
Copy link

I stumbled up on that issue today as well. It would be really nice if the fix can be releases in one of the next versions. I can help with testing if desired ;)

@pradtke
Copy link

pradtke commented Jun 30, 2022

Since jiripudil:preserve-aliases is a few commits behind master, I made my own branch from wikimedia:master and merged the PR into that, and tested it. It worked as I expected. I'm looking forward to this PR getting merged and released.

@steffendietz
Copy link

steffendietz commented Aug 19, 2022

Stumbled across #100 basically 5 minutes after discovering this plugin and giving it a spin.

Could this be moved forward, please? It's been more than 6 years since the issue was first described and now almost 2 years this seemingly functioning PR is just sitting here.

@HaaseIT
Copy link

HaaseIT commented Aug 22, 2022

@reedy any news on this?

@reedy reedy merged commit b23d003 into wikimedia:master Aug 22, 2022
@jiripudil jiripudil deleted the preserve-aliases branch August 22, 2022 14:06
@jiripudil
Copy link
Contributor Author

Wow, glad to see this merged, eventually. Thanks! 🫶

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

aliases on requires from included configs don't seem to work
8 participants