Closed tacman closed 10 months ago
great, this is shaping up well.
can you please add a changelog entry explaining what got removed and what to use instead? please remove the build for symfony 5.4 and the one with php 8.0
i fixed the lowest build with php 8.2 in the 3.x branch, rebasing on 3.x should fix it here too.
I took a stab at fixing the phpunit workflow, but not 100% sure I got right.
i fixed the lowest build with php 8.2 in the 3.x branch, rebasing on 3.x should fix it here too.
I didn't see that, and I'll admit that I'm not sure how to rebase.
git rebase means that you tell git to update your branch with the 3.x branch and apply your commits at the end of that branch. if you have checked out your fork as origin
, you could do git remote add liip git@github.com:liip/LiipImagineBundle.git
and git remote update
to have upstream available, then while you are on your branch, you do git rebase liip/3.x
and then git push --force-with-lease
. alternatively you can use git merge to merge the 3.x branch into your branch. that will create a merge commit, but i can squash the commits while merging so that is fine too.
OK, I'll try that. What I've been doing is going to the github page and syncing when it says my branch is behind, then pulling to pull local machine.
But I should learn rebase.
On Wed, Jan 3, 2024 at 11:36 AM David Buchmann @.***> wrote:
git rebase means that you tell git to update your branch with the 3.x branch and apply your commits at the end of that branch. if you have checked out your fork as origin, you could do git remote add liip @.***:liip/LiipImagineBundle.git and git remote update to have upstream available, then while you are on your branch, you do git rebase liip/3.x and then git push --force-with-lease. alternatively you can use git merge to merge the 3.x branch into your branch. that will create a merge commit, but i can squash the commits while merging so that is fine too.
— Reply to this email directly, view it on GitHub https://github.com/liip/LiipImagineBundle/pull/1549#issuecomment-1875729464, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAEXIQPW3HNBLNNHYB64B4TYMWJIJAVCNFSM6AAAAABBKJWPF2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZVG4ZDSNBWGQ . You are receiving this because you authored the thread.Message ID: @.***>
constant learning :+1:
but i don't want to block your progress, if its too complicated i can do the rebase to keep things moving.
Yes, please.
Also, can you provide a working version of the flysytem bundle config and liip_imagine config? I can provide a simple repo if that helps.
I have a messier repo, too, that used to work with Oneup but now won't install, it's a 2-year-old project and I'm fighting with dependencies. Ugh.
On Thu, Jan 4, 2024 at 6:47 AM David Buchmann @.***> wrote:
constant learning 👍
but i don't want to block your progress, if its too complicated i can do the rebase to keep things moving.
— Reply to this email directly, view it on GitHub https://github.com/liip/LiipImagineBundle/pull/1549#issuecomment-1877042713, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAEXIQLR4VF2IIEVIY57E7TYM2QF7AVCNFSM6AAAAABBKJWPF2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZXGA2DENZRGM . You are receiving this because you authored the thread.Message ID: @.***>
merged in #1557
i don't have a testing repository around with flysystem
I took a stab at upgrading the dependencies.
amazonwebservices/aws-sdk-for-php is abandoned, and is the only reason we have to support psr/log ^2. I'm pretty sure we can remove it in this version, as mentioned elsewhere it's only for V1 of the cache. WDYT?