Просмотр исходного кода

howto_release.md: updated changelog extraction

easier changelog for trac Wiki release pages
Markus Neteler 4 лет назад
Родитель
Сommit
7610d3b9b4
1 измененных файлов с 23 добавлено и 33 удалено
  1. 23 33
      doc/howto_release.md

+ 23 - 33
doc/howto_release.md

@@ -241,7 +241,7 @@ ssh neteler@$SERVER1 "cd $SERVER1DIR ; rm -f grass-$MAJOR.$MINOR-latest.md5sum"
 ssh neteler@$SERVER1 "cd $SERVER1DIR ; ln -s grass-$VERSION.tar.gz grass-$MAJOR.$MINOR-latest.md5sum"
 ssh neteler@$SERVER1 "cd $SERVER1DIR ; ln -s grass-$VERSION.tar.gz grass-$MAJOR.$MINOR-latest.md5sum"
 
 
 # verify
 # verify
-echo "https://$SERVER1/grass$MAJOR$MINOR/source/"
+echo "https://grass.osgeo.org/grass$MAJOR$MINOR/source/"
 
 
 # update winGRASS related files: Update the winGRASS version
 # update winGRASS related files: Update the winGRASS version
 vim grass-addons/tools/wingrass-packager/grass_packager_release.bat
 vim grass-addons/tools/wingrass-packager/grass_packager_release.bat
@@ -257,48 +257,38 @@ vim grass-addons/tools/addons/grass-addons.sh
 
 
 Release is done.
 Release is done.
 
 
-### Advertise new release
+### Advertise the new release
 
 
-#### Update CMS web site to show new version
+#### Write trac Wiki release page
 
 
-- News section
-- <https://grass.osgeo.org/download/software/>
-- <https://grass.osgeo.org/download/software/sources/>
-- <https://grass.osgeo.org/download/software/linux/>
-- <https://grass.osgeo.org/home/history/releases/>
-
-TODO: git tags
-
-- <https://grass.osgeo.org/development/svn/svn-tags/> (add tag): echo $RELEASETAG
-
-#### Write announcement and publish it
-
-To easily generate the entries for the trac Wiki release pages, use a `git log` approach:
-
-- List of latest changes (example, get from GitHub release page)
-   - https://github.com/OSGeo/grass/compare/releasebranch_7_8@%7B05-05-20%7D...releasebranch_7_8@%7B09-26-20%7D
-- identify start and end commit hash
+To easily generate the entries for the trac Wiki release page, use the `git log` approach:
 - extract entries from oneline git log and prepare for trac Wiki copy-paste:
 - extract entries from oneline git log and prepare for trac Wiki copy-paste:
 
 
 ```
 ```
-#START=76d5988
-#END=8a81328
-##git log --oneline | sed -n "+^$START+,+^$END+p;+^$END+q"
-
+# get date of previous release from https://github.com/OSGeo/grass/releases
 # verify
 # verify
-git log --oneline | sed -n '/^76d5988/,/^8a81328/p;/^8a81328/q' | tac
+git log --oneline --after="2020-10-05" | tac
 
 
-# prepare for trac Wiki release page
-git log --oneline | sed -n '/^76d5988/,/^8a81328/p;/^8a81328/q' | cut -d' ' -f2- | sed 's+^+ * G78:+g' | sort -u
+# prepare for trac Wiki release page (incl. PR trac macro)
+git log --oneline --after="2020-10-05" | cut -d' ' -f2- | sed 's+^+ * G78:+g' | sed 's+(#+(PR:+g' | sort -u
 ```
 ```
 
 
-- store entries in trac, by section:
+- store changelog entries in trac, by section:
     - <https://trac.osgeo.org/grass/wiki/Release/7.8.x-News>
     - <https://trac.osgeo.org/grass/wiki/Release/7.8.x-News>
-    - <https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures78>  <- add content
-      of major changes only
-- update version in <https://grasswiki.osgeo.org/wiki/GRASS-Wiki>
-- ~~store in Web as announces/announce_grass$MAJOR$MINOR$RELEASE.html <- how?
-  with protected PHP upload page?~~ (dropped since CMS)
+    - <https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures78>  <- add content of major changes only
+
+#### Update CMS web site to show new version (not for RCs!)
+
+Write announcement and publish it:
+- News section, https://github.com/OSGeo/grass-website/tree/master/content/news
+
+Software pages:
+- Linux: https://github.com/OSGeo/grass-website/blob/master/content/download/linux.en.md
+- Windows: https://github.com/OSGeo/grass-website/blob/master/content/download/windows.en.md
+- Mac: https://github.com/OSGeo/grass-website/blob/master/content/download/mac.en.md
+- Releases: https://github.com/OSGeo/grass-website/blob/master/content/about/history/releases.md
+- Wiki: https://grasswiki.osgeo.org/wiki/GRASS-Wiki
+
 
 
 #### Only in case of new major release
 #### Only in case of new major release