You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by "elharo (via GitHub)" <gi...@apache.org> on 2023/03/05 12:55:09 UTC
[GitHub] [maven] elharo opened a new pull request, #1035: protect the master branch to prevent accidental commits
elharo opened a new pull request, #1035:
URL: https://github.com/apache/maven/pull/1035
The goal is to keep committers (i.e. me) from accidentally pushing straight into master. I think this does that, but I've only done this before through the github UI so please review carefully.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455219603
> > > > > > > And this prevents release plugin as well (when doing a release from master)?
> > > > > >
> > > > > >
> > > > > > this one would be a blocker to me
> > > > >
> > > > >
> > > > > just saying nothing really prevents. create a branch `release/4.0.0-alpha` or `release/3.9.2` or `release/3.8.10` when starting the release process and then release from this branch. As is we do not block people merging to main branches during release process... Then once the release is done just create a PR from the `release/xxx` branch. The current way of releasing is a bit of legacy from svn days,
> > > >
> > > >
> > > > Bah, even more work...
> > >
> > >
> > > says the one is asking people to create jira for everything :P actually it's just 2 command line:
> > > ```
> > > * git checkout -b release/....
> > >
> > > * when done with the release from from the branch: `gh pr create -B`
> > > ```
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > > I just find the "hey guys hold on your merge for a week or two I'm releasing so nobody touch anything" a bit archaic svn/cvs style :) But this was just a comment from the peanut gallery. And nothing prevent someone to do it at the end of day.
> > > BTW I'm not for ban direct push but not for this release reason.
> >
> >
> > ...and how do you want to reconcile two diverging branches back to a linear history?
>
> I don't see the problem here. Can you explain?
>
> You have `maven-3.8.x` ready for `3.8.25` release. so create a branch `release/3.8.25`, then start the release process from this branch. At the end, you can create a PR from `release/3.8.25` to `maven-3.8.x` or just increment version in `maven-3.8.x` (as long as you have the tag, does the commit by the m-release-p really matter?)
What is master has developed from then? A ff-merge isn't possible anymore, no?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455085949
Well, this will also add overhead if you fix a typo and are safe to push directly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] olamy commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "olamy (via GitHub)" <gi...@apache.org>.
olamy commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455251625
> >
> >
> > I don't see the problem here. Can you explain?
> > You have `maven-3.8.x` ready for `3.8.25` release. so create a branch `release/3.8.25`, then start the release process from this branch. At the end, you can create a PR from `release/3.8.25` to `maven-3.8.x` or just increment version in `maven-3.8.x` (as long as you have the tag, does the commit by the m-release-p really matter?)
>
> What if master has developed from then? A ff-merge isn't possible anymore, no?
and so what is the problem?
the tag is there. it's the most important of a release. then just bump version in the main branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] cstamas commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "cstamas (via GitHub)" <gi...@apache.org>.
cstamas commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455129880
And this prevents release plugin as well (when released from master)?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] hboutemy commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "hboutemy (via GitHub)" <gi...@apache.org>.
hboutemy commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455145429
> And this prevents release plugin as well (when doing a release from master)?
this one would be a blocker to me
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] olamy commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "olamy (via GitHub)" <gi...@apache.org>.
olamy commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455219147
> > > > > > And this prevents release plugin as well (when doing a release from master)?
> > > > >
> > > > >
> > > > > this one would be a blocker to me
> > > >
> > > >
> > > > just saying nothing really prevents. create a branch `release/4.0.0-alpha` or `release/3.9.2` or `release/3.8.10` when starting the release process and then release from this branch. As is we do not block people merging to main branches during release process... Then once the release is done just create a PR from the `release/xxx` branch. The current way of releasing is a bit of legacy from svn days,
> > >
> > >
> > > Bah, even more work...
> >
> >
> > says the one is asking people to create jira for everything :P actually it's just 2 command line:
> > ```
> > * git checkout -b release/....
> >
> > * when done with the release from from the branch: `gh pr create -B`
> > ```
> >
> >
> >
> >
> >
> >
> >
> >
> >
> >
> >
> > I just find the "hey guys hold on your merge for a week or two I'm releasing so nobody touch anything" a bit archaic svn/cvs style :) But this was just a comment from the peanut gallery. And nothing prevent someone to do it at the end of day.
> > BTW I'm not for ban direct push but not for this release reason.
>
> ...and how do you want to reconcile two diverging branches back to a linear history?
I don't see the problem here. Can you explain?
You have `maven-3.8.x` ready for `3.8.25` release.
so create a branch `release/3.8.25`, then start the release process from this branch.
At the end, you can create a PR from `release/3.8.25` to `maven-3.8.x` or just increment version in `maven-3.8.x` (as long as you have the tag, does the commit by the m-release-p really matter?)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] olamy commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "olamy (via GitHub)" <gi...@apache.org>.
olamy commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455206222
> > And this prevents release plugin as well (when doing a release from master)?
>
> this one would be a blocker to me
just saying nothing really prevents. create a branch `release/4.0.0-alpha` or `release/3.9.2` or `release/3.8.10` when starting the release process and then release from this branch. As is we do not block people merging to main branches during release process...
Then once the release is done just create a PR from the `release/xxx` branch.
The current way of releasing is a bit of legacy from svn days,
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455217572
> > > > > And this prevents release plugin as well (when doing a release from master)?
> > > >
> > > >
> > > > this one would be a blocker to me
> > >
> > >
> > > just saying nothing really prevents. create a branch `release/4.0.0-alpha` or `release/3.9.2` or `release/3.8.10` when starting the release process and then release from this branch. As is we do not block people merging to main branches during release process... Then once the release is done just create a PR from the `release/xxx` branch. The current way of releasing is a bit of legacy from svn days,
> >
> >
> > Bah, even more work...
>
> says the one is asking people to create jira for everything :P actually it's just 2 command line:
>
> * git checkout -b release/....
>
> * when done with the release from from the branch: `gh pr create -B`
>
>
> I just find the "hey guys hold on your merge for a week or two I'm releasing so nobody touch anything" a bit archaic svn/cvs style :) But this was just a comment from the peanut gallery. And nothing prevent someone to do it at the end of day.
>
> BTW I'm not for ban direct push but not for this release reason.
...and how do you want to reconcile two diverging branches back to a linear history?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] olamy commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "olamy (via GitHub)" <gi...@apache.org>.
olamy commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455217071
> > > > And this prevents release plugin as well (when doing a release from master)?
> > >
> > >
> > > this one would be a blocker to me
> >
> >
> > just saying nothing really prevents. create a branch `release/4.0.0-alpha` or `release/3.9.2` or `release/3.8.10` when starting the release process and then release from this branch. As is we do not block people merging to main branches during release process... Then once the release is done just create a PR from the `release/xxx` branch. The current way of releasing is a bit of legacy from svn days,
>
> Bah, even more work...
says the one is asking people to create jira for everything :P
actually it's just 2 command line:
- git checkout -b release/....
- when done with the release from from the branch: `gh pr create -B`
I just find the "hey guys hold on your merge for a week or two I'm releasing so nobody touch anything" a bit archaic svn/cvs style :)
But this was just a comment from the peanut gallery. And nothing prevent someone to do it at the end of day.
BTW I'm not for ban direct push but not for this release reason.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on pull request #1035: protect the master branch to prevent accidental commits
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on PR #1035:
URL: https://github.com/apache/maven/pull/1035#issuecomment-1455207415
> > > And this prevents release plugin as well (when doing a release from master)?
> >
> >
> > this one would be a blocker to me
>
> just saying nothing really prevents. create a branch `release/4.0.0-alpha` or `release/3.9.2` or `release/3.8.10` when starting the release process and then release from this branch. As is we do not block people merging to main branches during release process... Then once the release is done just create a PR from the `release/xxx` branch. The current way of releasing is a bit of legacy from svn days,
Bah, even more work...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org