From 6aec7716abfd7974c289c9e876c6fe837731259c Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 24 May 2020 22:05:22 +0100 Subject: minor release process updates discovered in the 3.10 process --- release/allsource.mdwn | 2 ++ release/netsurfbuildsystem.mdwn | 20 ++++++++++---------- release/process.mdwn | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/release/allsource.mdwn b/release/allsource.mdwn index ca7cf01..51b136e 100644 --- a/release/allsource.mdwn +++ b/release/allsource.mdwn @@ -65,6 +65,8 @@ The modified submodules should then be added ready for commit ensure the component version in the Makefile has been updated +Update the `ChangeLog.md` as appropriate with rease version numbers etc. + finally tag the branch for release git tag -s -m 'Official Release' release/ diff --git a/release/netsurfbuildsystem.mdwn b/release/netsurfbuildsystem.mdwn index 8eb9299..4d580c6 100644 --- a/release/netsurfbuildsystem.mdwn +++ b/release/netsurfbuildsystem.mdwn @@ -39,23 +39,23 @@ Ensure the ca-bundle is updated https://curl.haxx.se/docs/caextract.html -create a branch releasing/\ and switch to it +create a branch `releasing/` and switch to it - git branch releasing/3.8 - git checkout releasing/3.8 + git branch releasing/3.11 + git checkout releasing/3.11 update desktop/version.c to something like #include "testament.h" - const char * const netsurf_version = "3.8 (25th April 2016)"; + const char * const netsurf_version = "3.11 (25th April 2016)"; const int netsurf_version_major = 3; - const int netsurf_version_minor = 8; + const int netsurf_version_minor = 11; update frontends/amiga/version.c along the same lines #define NETSURF_VERSION_MAJOR "3" - #define NETSURF_VERSION_MINOR_EXTERNAL "8" + #define NETSURF_VERSION_MINOR_EXTERNAL "11" commit to the branch @@ -73,12 +73,12 @@ ensure this shown the correct repo and the release tag something like [gitano] Welcome to the NetSurf Gitano instance. To ssh://nsgit@git.netsurf-browser.org/netsurf.git - * [new tag] release/3.7 -> release/3.7 + * [new tag] release/3.11 -> release/3.11 Next the branch must be merged back to master. git checkout master - git merge -s ours heads/releasing/3.7 + git merge -s ours heads/releasing/3.11 Then edit desktop/version.c and frontends/amiga/version.c ready for the next release cycle @@ -87,8 +87,8 @@ Then edit desktop/version.c and frontends/amiga/version.c ready for the next rel Remove releasing branch - git branch -d releasing/3.8 - Deleted branch releasing/3.8 (was 66fe825c8). + git branch -d releasing/3.11 + Deleted branch releasing/3.11 (was 66fe825c8). finally push master diff --git a/release/process.mdwn b/release/process.mdwn index 24701a9..899c518 100644 --- a/release/process.mdwn +++ b/release/process.mdwn @@ -29,7 +29,7 @@ after the buildsystem. Delete the `public_suffix_list.dat` file and run make, this will cause a fresh copy to be downloaded and converted. You will need the correct -perl modules installed for this step. +perl modules installed for this step (at least debian package libidna-punycode-perl). The [[release process|release/corebuildsystem]] is then the same as any other module using the core buildsystem. -- cgit v1.2.3