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

Address master rename #659

Merged
merged 2 commits into from
Feb 1, 2021
Merged

Address master rename #659

merged 2 commits into from
Feb 1, 2021

Conversation

greg0ire
Copy link
Member

No description provided.

@greg0ire
Copy link
Member Author

I have some doubts about this:

DoctrineMongoDBBundle/composer.json

Lines 57 to 61 in 30f3d4a

"extra": {
"branch-alias": {
"dev-master": "4.1.x-dev"
}
}

DoctrineMongoDBBundle/.doctrine-project.json

Lines 6 to 15 in 7992f67

{
"name": "4.3",
"branchName": "4.3.x",
"slug": "4.3",
"current": true,
"aliases": [
"current",
"stable"
]
},

Is master really supposed to be 5? Or just 4.4? Since you have a 4.3.x branch but no 4.3.0 that would be a bit weird, but it's better to check I suppose.

@greg0ire greg0ire force-pushed the update-branch-metadata branch 2 times, most recently from deeaae7 to 451fabb Compare November 24, 2020 20:16
@SenseException
Copy link
Member

I can't tell by the diff to master if the intended version was a major one.

@greg0ire
Copy link
Member Author

Maybe we should merge master into 4.3.x haha

@malarzm
Copy link
Member

malarzm commented Dec 5, 2020

As far as I can tell there are no plans for 5.x. It's safe to assume that master will become 4.4 at some point.

@greg0ire
Copy link
Member Author

greg0ire commented Dec 6, 2020 •
edited
Loading

I forgot about this. Since we voted to freeze the migration away from master, let's close this for now. I removed 5.0.x

It's safe to assume that master will become 4.4 at some point.

Then the branch-alias on that branch should be fixed.

@greg0ire greg0ire closed this Dec 6, 2020
@alcaeus
Copy link
Member

alcaeus commented Dec 7, 2020

As far as I can tell there are no plans for 5.x. It's safe to assume that master will become 4.4 at some point.

That is correct, no 5.x is currently planned. The next minor release will be in the 4.x major version.

@greg0ire greg0ire deleted the update-branch-metadata branch December 7, 2020 16:37
@greg0ire greg0ire restored the update-branch-metadata branch January 23, 2021 15:35
@greg0ire greg0ire reopened this Jan 23, 2021
@greg0ire greg0ire force-pushed the update-branch-metadata branch from 451fabb to 5a5e30a Compare January 23, 2021 15:38
@greg0ire
Copy link
Member Author

greg0ire commented Jan 23, 2021 •
edited
Loading

The migration away from master is resumed.

Todo for @alcaeus or @malarzm :

  • use Github's rename feature to rename master to 4.4.x
  • merge this
  • merge 4.3.x up into 4.4.x

@greg0ire greg0ire changed the title Generate documentation for the next major Address master rename Jan 23, 2021
@greg0ire greg0ire force-pushed the update-branch-metadata branch from 4ea06cb to 13548a6 Compare January 23, 2021 16:25
@greg0ire greg0ire requested review from alcaeus and malarzm January 23, 2021 16:30
malarzm
malarzm reviewed Jan 23, 2021
View reviewed changes
.doctrine-project.json
@@ -3,6 +3,12 @@
"shortName": "DoctrineMongoDBBundle",
"slug": "doctrine-mongodb-bundle",
"versions": [
{
"name": "4.4",
"branchName": "4.4.x",
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this happen after we release 4.3.0 and have 4.4.x branch in place?

Copy link
Member Author

@greg0ire greg0ire Jan 23, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

master can be renamed to 4.4.x right now, there is no need for releasing 4.3.0 for that, is there? It's the first item of the todo list 🙂

Copy link
Member

Choose a reason for hiding this comment

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

Dang, this is about renaming master to 4.4.x first 🤦‍♂️

Copy link
Member

Choose a reason for hiding this comment

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

@greg0ire yeah sorry, I went straight to the review from first email and haven't seen the todo list :)

Copy link
Member Author

Choose a reason for hiding this comment

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

@malarzm let's proceed? I can do it if you don't feel comfortable with that, but I'd rather you approve this PR before going through the todo list myself.

Copy link
Member

Choose a reason for hiding this comment

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

Sorry for the lag, sadly I didn't find as much time for ODM last week as I wanted. Going through the checklist now :)

@franmomu franmomu mentioned this pull request Jan 24, 2021
Merged
@greg0ire greg0ire force-pushed the update-branch-metadata branch from 13548a6 to d5698b4 Compare January 30, 2021 18:01
@malarzm
Copy link
Member

malarzm commented Feb 1, 2021

Thanks @greg0ire for preparing this!

@malarzm malarzm added this to the 4.3.0 milestone Feb 1, 2021
@malarzm malarzm added the Task label Feb 1, 2021
@malarzm malarzm merged commit 560191b into doctrine:4.3.x Feb 1, 2021
@malarzm
Copy link
Member

malarzm commented Feb 1, 2021

merge 4.3.x up into 4.4.x

I'll let our automation handle that after releasing 4.3.0 :)

@greg0ire greg0ire deleted the update-branch-metadata branch February 1, 2021 19:34
@github-actions github-actions bot mentioned this pull request Feb 1, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@malarzm malarzm malarzm approved these changes

@alcaeus alcaeus Awaiting requested review from alcaeus

Assignees
No one assigned
Labels
Task
Projects
None yet
Milestone
4.3.0
Development

Successfully merging this pull request may close these issues.
4 participants
@greg0ire @SenseException @malarzm @alcaeus