|
@@ -59,12 +59,12 @@ Now check if configure still works.
|
|
|
If yes, submit to git:
|
|
|
|
|
|
```bash
|
|
|
-git checkout -b config_sub_update_r78
|
|
|
+git checkout -b config_sub_update_r80
|
|
|
git add config.guess config.sub configure
|
|
|
-git commit -m"config.guess + config.sub: updated from http://git.savannah.gnu.org/cgit/config.git/plain/" config.guess config.sub configure
|
|
|
+git commit -m"config.guess + config.sub: updated from http://git.savannah.gnu.org/cgit/config.git/plain/"
|
|
|
# test by running ./configure
|
|
|
|
|
|
-git push origin config_sub_update_r78
|
|
|
+git push origin config_sub_update_r80
|
|
|
# open PR and merge
|
|
|
```
|
|
|
|
|
@@ -104,15 +104,15 @@ git status
|
|
|
|
|
|
Directly edit VERSION file in GH interface:
|
|
|
|
|
|
-<https://github.com/OSGeo/grass/blob/releasebranch_7_8/include/VERSION>
|
|
|
+<https://github.com/OSGeo/grass/blob/releasebranch_8_0/include/VERSION>
|
|
|
|
|
|
Example:
|
|
|
|
|
|
```bash
|
|
|
-7
|
|
|
8
|
|
|
-1RC1
|
|
|
-2019
|
|
|
+0
|
|
|
+0RC1
|
|
|
+2021
|
|
|
```
|
|
|
|
|
|
### Create release tag
|
|
@@ -128,8 +128,8 @@ Preparation:
|
|
|
# assumptions:
|
|
|
# - own fork as "origin"
|
|
|
# - remote repo as "upstream"
|
|
|
-git fetch --all --prune && git checkout releasebranch_7_8 && \
|
|
|
- git merge upstream/releasebranch_7_8 && git push origin releasebranch_7_8
|
|
|
+git fetch --all --prune && git checkout releasebranch_8_0 && \
|
|
|
+ git merge upstream/releasebranch_8_0 && git push origin releasebranch_8_0
|
|
|
|
|
|
# create version env var for convenience:
|
|
|
MAJOR=`cat include/VERSION | head -1 | tail -1`
|
|
@@ -155,7 +155,7 @@ To be done in GH interface:
|
|
|
<https://github.com/OSGeo/grass/releases/new>
|
|
|
|
|
|
Tag version | target (examples):
|
|
|
- 7.8.1RC1 | releasebranch_7_8
|
|
|
+ 8.0.0RC1 | releasebranch_8_0
|
|
|
|
|
|
Add release desciption (re-use existing texts as possible, from
|
|
|
<https://github.com/OSGeo/grass/releases>)
|
|
@@ -184,15 +184,15 @@ gzip ChangeLog_$VERSION
|
|
|
|
|
|
Directly edit VERSION file in GH interface:
|
|
|
|
|
|
-<https://github.com/OSGeo/grass/blob/releasebranch_7_8/include/VERSION>
|
|
|
+<https://github.com/OSGeo/grass/blob/releasebranch_8_0/include/VERSION>
|
|
|
|
|
|
Example:
|
|
|
|
|
|
```bash
|
|
|
-7
|
|
|
8
|
|
|
+0
|
|
|
1dev
|
|
|
-2019
|
|
|
+2021
|
|
|
```
|
|
|
|
|
|
Commit as "back to dev"
|
|
@@ -204,8 +204,8 @@ Reset local copy to GH:
|
|
|
# assumptions:
|
|
|
# - own fork as "origin"
|
|
|
# - remote repo as "upstream"
|
|
|
-git fetch --all --prune && git checkout releasebranch_7_8 && \
|
|
|
- git merge upstream/releasebranch_7_8 && git push origin releasebranch_7_8
|
|
|
+git fetch --all --prune && git checkout releasebranch_8_0 && \
|
|
|
+ git merge upstream/releasebranch_8_0 && git push origin releasebranch_8_0
|
|
|
```
|
|
|
|
|
|
### Upload source code tarball to OSGeo servers
|
|
@@ -261,6 +261,7 @@ vim grass-addons/tools/addons/grass-addons.sh
|
|
|
|
|
|
Release is done.
|
|
|
|
|
|
+
|
|
|
### Advertise the new release
|
|
|
|
|
|
#### Write trac Wiki release page
|
|
@@ -271,15 +272,15 @@ To easily generate the entries for the trac Wiki release page, use the `git log`
|
|
|
```
|
|
|
# get date of previous release from https://github.com/OSGeo/grass/releases
|
|
|
# verify
|
|
|
-git log --oneline --after="2020-10-05" | tac
|
|
|
+git log --oneline --after="2021-10-10" | tac
|
|
|
|
|
|
# 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
|
|
|
+git log --oneline --after="2021-10-10" | cut -d' ' -f2- | sed 's+^+ * G80:+g' | sed 's+(#+(PR:+g' | sort -u
|
|
|
```
|
|
|
|
|
|
- store changelog entries in trac, by section:
|
|
|
- - <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
|
|
|
+ - <https://trac.osgeo.org/grass/wiki/Release/8.0.x-News>
|
|
|
+ - <https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures80> <- add content of major changes only
|
|
|
|
|
|
#### Update CMS web site to show new version (not for RCs!)
|
|
|
|
|
@@ -301,20 +302,7 @@ Software pages:
|
|
|
- wiki updates, only when new major release:
|
|
|
- {{cmd|xxxx}} macro: <https://grasswiki.osgeo.org/wiki/Template:Cmd>
|
|
|
- update last version on main page
|
|
|
-- trac updates, only when new major release:
|
|
|
- - Set "complete" flag in <https://trac.osgeo.org/grass/milestone/7.8.x> -->
|
|
|
- Edit Milestone
|
|
|
- - also: Retarget associated open tickets to milestone 7.8.x
|
|
|
- - Batch modify tickets, set to next milestone (update this query
|
|
|
- accordingly: two entries to change):
|
|
|
- - <https://trac.osgeo.org/grass/query?status=assigned&status=new&status=reopened&milestone=7.8.0&milestone=7.8.1&group=status&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&order=priority>
|
|
|
- - Set max items to 1000, then select all shown tickets via Status:
|
|
|
- assigned/new/reopened sections
|
|
|
- - Scroll down to "Batch modify": under the "Comment" section, add Field
|
|
|
- "Milestone" and set to next version
|
|
|
- - then use "Change ticket" button, done.
|
|
|
- - Only in case of new release branch being created:
|
|
|
-- Add Wiki Macro definitions for manual pages G7X:modulename
|
|
|
+- Add trac Wiki Macro definitions for manual pages G8X:modulename
|
|
|
- Edit: <https://trac.osgeo.org/grass/wiki/InterMapTxt>
|
|
|
|
|
|
#### WinGRASS notes
|
|
@@ -322,21 +310,21 @@ Software pages:
|
|
|
- Update grass_packager_release.bat, eg.
|
|
|
|
|
|
```
|
|
|
- set MAJOR=7
|
|
|
- set MINOR=8
|
|
|
+ set MAJOR=8
|
|
|
+ set MINOR=0
|
|
|
set PATCH=0RC1
|
|
|
```
|
|
|
|
|
|
- Update addons (grass_addons.sh) rules, eg.
|
|
|
|
|
|
```
|
|
|
- compile $GIT_PATH/grass7 $GISBASE_PATH/grass780RC1 $ADDON_PATH/grass780RC1/addons
|
|
|
+ compile $GIT_PATH/grass8 $GISBASE_PATH/grass800RC1 $ADDON_PATH/grass800RC1/addons
|
|
|
```
|
|
|
|
|
|
- Modify grass_copy_wwwroot.sh accordingly, eg.
|
|
|
|
|
|
```
|
|
|
- copy_addon 781RC1 7.8.1RC1
|
|
|
+ copy_addon 800RC1 8.0.0RC1
|
|
|
```
|
|
|
|
|
|
#### Launchpad notes
|