Skip to content

Address master rename #659

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

Merged
merged 2 commits into from
Feb 1, 2021
Merged

Address master rename #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f5de5e
Generate documentation for the next minor
greg0ire Nov 24, 2020
d5698b4
Remove references to master
greg0ire Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .doctrine-project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :)

"slug": "latest",
"upcoming": true
},
{
"name": "4.3",
"branchName": "4.3.x",
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/coding-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ on:
pull_request:
branches:
- "*.x"
- "master"
push:
branches:
- "*.x"
- "master"

jobs:
coding-standards:
Expand Down
5 changes: 0 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,5 @@
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "4.1.x-dev"
}
}
}