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

chore(deps): enable Dependabot v2' #1187

Merged
merged 1 commit into from
Oct 18, 2024
Merged

Conversation

sullis
Copy link

@sullis sullis commented Jul 24, 2020

Copy link
Contributor

@rhusar rhusar left a comment

Choose a reason for hiding this comment

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

LGTM

@rhusar
Copy link
Contributor

rhusar commented Oct 18, 2024

@fabiobrz Sounds like this should have gone in long time ago..

@fabiobrz
Copy link
Collaborator

@fabiobrz Sounds like this should have gone in long time ago..

+1, thanks @rhusar - we've got quite a bit of them that we should check... Oh, time...
Adding to the TODOs... 🙂

@fabiobrz
Copy link
Collaborator

Right, it looks like we do have a bunch of PRs from dependantbot, including one by dependantbot-preview itself.
Anyway, changes LGTM, thanks @sullis!
Let's start by merging this one, and see whether some of the existing ones get closed automagically.

@fabiobrz fabiobrz merged commit 5378483 into arquillian:master Oct 18, 2024
@fabiobrz
Copy link
Collaborator

It ended up in master, sure 😄 - ok then, let's backport to main

@rhusar
Copy link
Contributor

rhusar commented Oct 18, 2024

@fabiobrz Why on earth would there be both main and master branches?! The branch should have been just renamed and then all existing PRs get automatically fixed by Github..

@fabiobrz
Copy link
Collaborator

Eh... It happened (or didn't, actually) here: #1299

We've been merging changes into master and then we basically branched main out of it, IIRC.

I know @rhusar, bad move, but it's gone now 🙁... Any suggestions to fix other than pruning + cloning what's left?

@rhusar
Copy link
Contributor

rhusar commented Oct 18, 2024

Eh... It happened (or didn't, actually) here: #1299

We've been merging changes into master and then we basically branched main out of it, IIRC.

I know @rhusar, bad move, but it's gone now 🙁... Any suggestions to fix other than pruning + cloning what's left?

Not sure what's the branching strategy, but quick look:

So master is now effectively support branch for 1.x stream? So you can just rename it to 1.x then.

And if 2.0.x is already completely merged into main, delete that.

@fabiobrz
Copy link
Collaborator

Renaming master to 1.x could definitely be a good point, specifically in order to get to a release soon.

@jimma suggested a similar thing. I'll give this a try and we'll see how it goes.

+1 on deleting the 2.x branch.

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