<!DOCTYPE html>
<!-- BaNnErBlUrFlE-BoDy-start -->
<!-- Preheader Text : BEGIN -->
<div style="display:none !important;display:none;visibility:hidden;mso-hide:all;font-size:1px;color:#ffffff;line-height:1px;height:0px;max-height:0px;opacity:0;overflow:hidden;">
On Wed, 31 Jul 2024, Adrian Croucher wrote: > > On 31/07/24 4: 47 pm, Satish Balay wrote: > > Major releases [i. e. 3. 21. 0, 3. 22. 0 etc. ] are spun from main branch once > > every 6 months. > > And bug fix updates [i. e.
</div>
<!-- Preheader Text : END -->
<!-- Email Banner : BEGIN -->
<div style="display:none !important;display:none;visibility:hidden;mso-hide:all;font-size:1px;color:#ffffff;line-height:1px;height:0px;max-height:0px;opacity:0;overflow:hidden;">ZjQcmQRYFpfptBannerStart</div>
<!--[if ((ie)|(mso))]>
<table border="0" cellspacing="0" cellpadding="0" width="100%" style="padding: 16px 0px 16px 0px; direction: ltr" ><tr><td>
<table border="0" cellspacing="0" cellpadding="0" style="padding: 0px 10px 5px 6px; width: 100%; border-radius:4px; border-top:4px solid #90a4ae;background-color:#D0D8DC;"><tr><td valign="top">
<table align="left" border="0" cellspacing="0" cellpadding="0" style="padding: 4px 8px 4px 8px">
<tr><td style="color:#000000; font-family: 'Arial', sans-serif; font-weight:bold; font-size:14px; direction: ltr">
This Message Is From an External Sender
</td></tr>
<tr><td style="color:#000000; font-weight:normal; font-family: 'Arial', sans-serif; font-size:12px; direction: ltr">
This message came from outside your organization.
</td></tr>
</table>
</td></tr></table>
</td></tr></table>
<![endif]-->
<![if !((ie)|(mso))]>
<div dir="ltr" id="pfptBannercrt9tvk" style="all: revert !important; display:block !important; text-align: left !important; margin:16px 0px 16px 0px !important; padding:8px 16px 8px 16px !important; border-radius: 4px !important; min-width: 200px !important; background-color: #D0D8DC !important; background-color: #D0D8DC; border-top: 4px solid #90a4ae !important; border-top: 4px solid #90a4ae;">
<div id="pfptBannercrt9tvk" style="all: unset !important; float:left !important; display:block !important; margin: 0px 0px 1px 0px !important; max-width: 600px !important;">
<div id="pfptBannercrt9tvk" style="all: unset !important; display:block !important; visibility: visible !important; background-color: #D0D8DC !important; color:#000000 !important; color:#000000; font-family: 'Arial', sans-serif !important; font-family: 'Arial', sans-serif; font-weight:bold !important; font-weight:bold; font-size:14px !important; line-height:18px !important; line-height:18px">
This Message Is From an External Sender
</div>
<div id="pfptBannercrt9tvk" style="all: unset !important; display:block !important; visibility: visible !important; background-color: #D0D8DC !important; color:#000000 !important; color:#000000; font-weight:normal; font-family: 'Arial', sans-serif !important; font-family: 'Arial', sans-serif; font-size:12px !important; line-height:18px !important; line-height:18px; margin-top:2px !important;">
This message came from outside your organization.
</div>
</div>
<div style="clear: both !important; display: block !important; visibility: hidden !important; line-height: 0 !important; font-size: 0.01px !important; height: 0px"> </div>
</div>
<![endif]>
<div style="display:none !important;display:none;visibility:hidden;mso-hide:all;font-size:1px;color:#ffffff;line-height:1px;height:0px;max-height:0px;opacity:0;overflow:hidden;">ZjQcmQRYFpfptBannerEnd</div>
<!-- Email Banner : END -->
<!-- BaNnErBlUrFlE-BoDy-end -->
<html>
<head><!-- BaNnErBlUrFlE-HeAdEr-start -->
<style>
#pfptBannercrt9tvk { all: revert !important; display: block !important;
visibility: visible !important; opacity: 1 !important;
background-color: #D0D8DC !important;
max-width: none !important; max-height: none !important }
.pfptPrimaryButtoncrt9tvk:hover, .pfptPrimaryButtoncrt9tvk:focus {
background-color: #b4c1c7 !important; }
.pfptPrimaryButtoncrt9tvk:active {
background-color: #90a4ae !important; }
</style>
<!-- BaNnErBlUrFlE-HeAdEr-end -->
<meta charset="US-ASCII"></head><body><pre style="font-family: sans-serif; font-size: 100%; white-space: pre-wrap; word-wrap: break-word">On Wed, 31 Jul 2024, Adrian Croucher wrote:
>
> On 31/07/24 4:47 pm, Satish Balay wrote:
> > Major releases [i.e. 3.21.0, 3.22.0 etc.] are spun from main branch once
> > every 6 months.
> > And bug fix updates [i.e. 3.21.1, 3.21.2 etc.] are spun from release branch
> > once every month [during this 6 month cycle].
> >
> > i.e PetscObjectIsNull() change that's currently in main branch won't be in a
> > tarball (or a tagged version) until 3.22.0 release in Sept end.
>
> I guess I'm still a bit confused by your system. What exactly is e.g. the
> recent commit with tag "3.21.4", if it isn't a "tagged version"?
>
> That tag appears to be on the "release" branch as well as "main" - i.e. I can
> see it if I look at the commits for the "release" branch. So it looked to me
> like a minor release. How are users supposed to interpret those tags?
Sorry for all the confusion.
You should interpret the release process as I described above. Different projects use different git workflows.
Our release workflow:
- New features [and other changes] go into 'main' development branch. There could be API changes here. They get released every 6 months as 3.21[.0], 3.22[.0], 3.23[.0] major releases.
- Since this is a major release - the release branch is synced with all these changes from main (that correspond to this major release) - at this point in time.
- Subsequent bug fixes go into this 'release' branch. There is no API changes here, These patch updates get released every month [i.e 3.21.1, 3.21.2, ... 3.21.6] until the next major release 3.22.0.
Here one could easily update from 3.21.1 to 3.21.6 (i.e not be stuck at 3.21.0) without fear of API changes breaking their application code [and getting the bug fixes for the current release]
- And all release bug fixes are also needed in 'main' branch - so there is a frequent merge of 'release' to main' during these 6 months.
i.e "looking at latest tags in the main branch and assuming it corresponds to the *latest* snapshot of main changes" is min-interpreting our release workflow.
Also note: our release docs are at: <a href="https://urldefense.us/v3/__https://petsc.org/release/__;!!G_uCfscf7eWS!cki0uYPhZTPbxunajvNTcZaxLD9JegmvdpZpXbKlwChtoCpykn6IvPXbZwK4TiVyAVJrMDktrLraRTLPqEzgUeMbxg$">https://urldefense.us/v3/__https://petsc.org/release/__;!!G_uCfscf7eWS!cki0uYPhZTPbxunajvNTcZaxLD9JegmvdpZpXbKlwChtoCpykn6IvPXbZwK4TiVyAVJrMDktrLraRTLPqEzgUeMbxg$</a>
And development docs are at <a href="https://urldefense.us/v3/__https://petsc.org/main/__;!!G_uCfscf7eWS!cki0uYPhZTPbxunajvNTcZaxLD9JegmvdpZpXbKlwChtoCpykn6IvPXbZwK4TiVyAVJrMDktrLraRTLPqEzqge3b1A$">https://urldefense.us/v3/__https://petsc.org/main/__;!!G_uCfscf7eWS!cki0uYPhZTPbxunajvNTcZaxLD9JegmvdpZpXbKlwChtoCpykn6IvPXbZwK4TiVyAVJrMDktrLraRTLPqEzqge3b1A$</a> esp: <a href="https://urldefense.us/v3/__https://petsc.org/main/changes/dev/__;!!G_uCfscf7eWS!cki0uYPhZTPbxunajvNTcZaxLD9JegmvdpZpXbKlwChtoCpykn6IvPXbZwK4TiVyAVJrMDktrLraRTLPqEwbYDZzrQ$">https://urldefense.us/v3/__https://petsc.org/main/changes/dev/__;!!G_uCfscf7eWS!cki0uYPhZTPbxunajvNTcZaxLD9JegmvdpZpXbKlwChtoCpykn6IvPXbZwK4TiVyAVJrMDktrLraRTLPqEwbYDZzrQ$</a> that list the changes scheduled for the next (major) release.
Satish
</pre></body></html>