-
Notifications
You must be signed in to change notification settings - Fork 85
Merge master branch into stable-2.361.1 #332
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
Conversation
The chocolatey package was never completed. This removes the files.
chore: Remove chocolatey package files
`git status` is not clean
Thanks @NotMyFault |
Why was this PR needed? As far as I can tell, it contained no justification and everything that we cared about from an end-user perspective had been backported already (without the |
It's part of the LTS release checklist. The LTS part expects that the stable branch is up-to-date with changes from the master branch. |
Well sure but this kind of blind merging is precisely the type of thing that Wadeck was objecting to in another thread. There needs to be a justification for each backport. |
this is not a backport as such, we freeze the branch at the start of each new LTS line (can be frozen earlier if say weekly has moved on with a breaking change we don't want to pull). |
Then why even create the branch earlier? Just create it at the time that you are freezing it. But this doesn't make sense to me, since the entire point of a stable branch is to freeze it before the release to create a window of time during which stabilization can occur. |
A legitimate question. The packaging branch isn't needed until you plan to trigger the LTS job, is it? |
Might be a side effect from making the LTS decision earlier before the previous LTS line is even finished. Previously, the baseline decision (and start of backporting) was the same week as .3 release, which would be a natural time to start creating branches.
Why do we need to pick up packaging changes in weeklies after the baseline? Selectively for infra reasons makes sense, as well as regular bugfix backports like we do in core, but wholesale everything? |
Exactly, that is my point as well regarding stabilization. The primary purpose of branching x number of days/weeks prior to a release is to avoid picking up potentially buggy commits on the stable branch, i.e. to create a stabilization period. Syncing indiscriminately during that time exposes the stable branch to new bugs/regressions, which defeats the point. |
Correct the checklist phrasing to note that we need to review changes from the master branch but we don't want to merge them without discussion and consideration of the impact of each of the differences. jenkinsci/packaging#332 (comment) is the inspiration for this pull request.
Prep for 2.361.1