|
273 | 273 | <hi rend="bold">Note:</hi> Tests may need to be updated after copying the updated p5subset.xml file to the Stylesheets/source directory of the Stylesheets release-X.X.X branch. It is recommended to use <code>make DIFFNOW=0 test</code> as this will generate all the actual results and then compare against the expected results afterwards. Once the actual results are generated, you have to manually compare the expected-results and actual-results folders (both under Stylesheets\Test\) and check through all of the files containing differences.</item> |
274 | 274 | <item><hi rend="bold">Announce a freeze on pushes to the release branch on the |
275 | 275 | TEI Technical Council mailing list</hi></item> |
276 | | - <!-- Steps 5 and 6 which instruct on how to merge the release branch into the released branch were originally here, but proved to be too early in the process and have now been moved after step 14 --> |
| 276 | + |
| 277 | + <item><hi rend="bold">Commit your changes to the P5 release branch <code>release-X.X.X</code></hi>. <lb/> |
| 278 | + </item> |
| 279 | + |
| 280 | + <item><hi rend="bold">Repeat the steps above for the Stylesheets</hi> (have a stylesheets expert on hand to help debug problems): |
| 281 | + <list type="ordered"> |
| 282 | + <item>Edit the Stylesheets/VERSION number to the correct release number (usually just |
| 283 | + remove the 'a').</item> |
| 284 | + <item>Run <code>make log</code> to generate the changelog. Then commit the changes.</item> |
| 285 | + </list> |
| 286 | + </item> |
| 287 | + <!-- Steps 5 and 6 which instruct on how to merge the release branch into the released branch were originally here, but for the Jan 2025 creating the released branch at this point proved to be too early in the process and have now been moved after step 14 --> |
277 | 288 | <item><hi rend="bold">Push your changes</hi> for both P5 and the Stylesheets to the git |
278 | 289 | repository, <code>git push origin release-X.X.X</code><lb/> and watch Jenkins build P5 for you.<lb/> |
279 | 290 | This should be the final push for this version, and it will trigger the Jenkins servers |
|
374 | 385 | <code>git checkout released</code><lb/> |
375 | 386 | <code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item> |
376 | 387 |
|
377 | | - <item><hi rend="bold">Repeat the steps above for the Stylesheets</hi> (have a stylesheets expert on hand when releasing Stylesheets to help debug problems): |
| 388 | + <item><hi rend="bold">Repeat the steps above for the Stylesheets</hi>: |
378 | 389 | <list type="ordered"> |
379 | | - <item>Edit the Stylesheets/VERSION number to the correct release number (usually just |
380 | | - remove the 'a').</item> |
381 | | - <item>Run <code>make log</code> to generate the changelog. Then commit the changes.</item> |
382 | 390 | <item>Merge the release branch into <code>released</code><lb/> |
383 | 391 | <code>git checkout released</code><lb/> |
384 | 392 | <code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code> |
|
0 commit comments