https://dev.arvados.org/https://dev.arvados.org/favicon.ico?15576888422021-10-04T20:50:52ZArvadosArvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=975482021-10-04T20:50:52ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Target version</strong> changed from <i>2021-10-13 sprint</i> to <i>2021-10-27 sprint</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=975512021-10-04T21:39:36ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/97551/diff?detail_id=94238">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=975592021-10-05T17:53:31ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/97559/diff?detail_id=94247">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=975872021-10-06T15:29:28ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/97587/diff?detail_id=94272">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=976062021-10-07T14:50:28ZPeter Amstutzpeter.amstutz@curii.com
<ul></ul><p>How about this:</p>
<ol>
<li>X.Y-dev is still actually a development branch for that release.</li>
<li>When the release happens, we create a X.Y-release branch. This points to latest release in the X.Y series. The head of the branch should be the same as the tag for the latest release. This branch is only updated for actual releases.</li>
<li>On each major release, go to github and set the "default branch" to the X.Y-release branch.</li>
</ol> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=976112021-10-07T15:14:42ZTom Cleggtom@curii.com
<ul></ul><p>It seems a bit weird to me to arrange our github setup to accommodate the (anti?)pattern of an install recipe that starts by cloning a git repo.</p>
More ideas:
<ul>
<li>at <a class="external" href="https://doc.arvados.org/v2.2/install/salt-single-host.html">https://doc.arvados.org/v2.2/install/salt-single-host.html</a>, provide a snippet that does the exactly correct "git clone" command (the current language is "cloning the 2.2-dev branch from {url}" which makes it easy to forget the checkout step, and depending on familiarity with git might even be misinterpreted to mean "cloning {url} gives you the 2.2-dev branch")</li>
<li>in the provision.sh script, error out if being run from a git tree with a non-released version and the user isn't explicitly asking for a development version</li>
</ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=976852021-10-12T19:31:48ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/97685/diff?detail_id=94367">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=976862021-10-12T19:34:20ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/97686/diff?detail_id=94368">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=976872021-10-12T19:36:23ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Target version</strong> changed from <i>2021-10-27 sprint</i> to <i>2021-11-10 sprint</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=979912021-10-27T14:48:56ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Target version</strong> changed from <i>2021-11-10 sprint</i> to <i>2021-11-24 sprint</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=984372021-11-10T16:26:07ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Target version</strong> changed from <i>2021-11-24 sprint</i> to <i>2021-12-08 sprint</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=989612021-11-24T16:29:32ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/98961/diff?detail_id=95646">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=989872021-11-24T17:00:23ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Assigned To</strong> set to <i>Peter Amstutz</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=994122021-12-07T20:36:11ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Target version</strong> changed from <i>2021-12-08 sprint</i> to <i>2022-01-05 sprint</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=994762021-12-08T16:31:28ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Assigned To</strong> changed from <i>Peter Amstutz</i> to <i>Ward Vandewege</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=994772021-12-08T16:35:34ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Target version</strong> changed from <i>2022-01-05 sprint</i> to <i>2022-01-19 sprint</i></li><li><strong>Assigned To</strong> deleted (<del><i>Ward Vandewege</i></del>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=999032022-01-06T15:57:42ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Subject</strong> changed from <i>Development process feedback</i> to <i>Rename release branches to X.Y-release</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=999042022-01-06T15:58:15ZPeter Amstutzpeter.amstutz@curii.com
<ul><li><strong>Assigned To</strong> set to <i>Ward Vandewege</i></li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=999222022-01-06T16:41:07ZWard Vandewegeward@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/99922/diff?detail_id=96576">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=999232022-01-06T16:45:10ZWard Vandewegeward@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/99923/diff?detail_id=96577">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=999242022-01-06T16:51:11ZWard Vandewegeward@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/99924/diff?detail_id=96578">diff</a>)</li></ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=999252022-01-06T16:53:23ZWard Vandewegeward@curii.com
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/99925/diff?detail_id=96579">diff</a>)</li></ul><p>Existing `-dev` branches:</p>
<table>
<tr>
<th>branch</th>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>1.2-dev</td>
<td>arvados</td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>1.3-dev</td>
<td>arvados</td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>1.4-dev</td>
<td>arvados</td>
<td>arvados-workbench2</td>
<td></td>
<td></td>
</tr>
<tr>
<td>2.0-dev</td>
<td>arvados</td>
<td>arvados-workbench2</td>
<td></td>
<td></td>
</tr>
<tr>
<td>2.1-dev</td>
<td>arvados</td>
<td>arvados-workbench2</td>
<td></td>
<td></td>
</tr>
<tr>
<td>2.2-dev</td>
<td>arvados</td>
<td>arvados-workbench2</td>
<td>arvados-formula</td>
<td>there are some deployments out there that used 2.2-dev, do not remove that branch</td>
</tr>
<tr>
<td>2.3-dev</td>
<td>arvados</td>
<td>arvados-workbench2</td>
<td>arvados-formula</td>
<td></td>
</tr>
</table>
<p>We only have the last four pushed to github at the moment.</p>
Things to update:
<ul>
<li>DONE <a class="external" href="https://dev.arvados.org/projects/arvados/wiki/Release_Checklist">https://dev.arvados.org/projects/arvados/wiki/Release_Checklist</a> (though, this is now handled by art)</li>
<li>DONE rename git.arvados.org branches</li>
<li>DONE rename github branches</li>
<li>DONE /usr/local/bin/update-doc.arvados.org.sh on `public`</li>
<li>DONE arvados git repo `pre-receive` and `post-update` hooks</li>
<li>DONE local checkouts for everyone -> notify team</li>
<li>DONE doc: `_includes/_branchname.liquid` and `install/arvbox.html.textile.liquid`, also in the old release branches (2.2 and 2.3 only)</li>
<li>DONE rename git.arvados.org branches for the arvados-workbench2 repo</li>
<li>DONE rename github branches for the arvados-workbench2 repo</li>
<li>DONE arvados-workbench2 git repo `pre-receive` hooks</li>
<li>DONE rename git.arvados.org branches for the arvados-formula repo</li>
<li>DONE rename github branches for the arvados-formula repo</li>
<li>DONE arvados-formula git repo `pre-receive` hooks</li>
</ul> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=999272022-01-06T17:57:11ZWard Vandewegeward@curii.com
<ul></ul><p>Instructions to fix local checkouts of the old `-dev` branches (e.g. for 2.3):</p>
<pre>
git remote update origin --prune # update the list of remote branches
git branch -d 2.3-dev # delete the local 2.3-dev branch
git checkout 2.3-release # checkout the new 2.3-release branch
</pre>
<p>Please don't push the old `-dev` branches again (it will not be allowed, I updated our git hook to check for that).</p> Arvados - Idea #18249: Rename release branches to X.Y-releasehttps://dev.arvados.org/issues/18249?journal_id=999282022-01-06T18:21:21ZWard Vandewegeward@curii.com
<ul><li><strong>% Done</strong> changed from <i>0</i> to <i>100</i></li><li><strong>Status</strong> changed from <i>New</i> to <i>Resolved</i></li></ul><p>Applied in changeset <a class="changeset" title="Release branches were renamed. closes #18249 Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <war..." href="https://dev.arvados.org/projects/arvados/repository/arvados/revisions/e2d8cb447c7b5f7b5800e9982ca9178c689a8142">arvados|e2d8cb447c7b5f7b5800e9982ca9178c689a8142</a>.</p>