[Git][NTPsec/ntpsec][master] update and fix the release process notes

Mark Atwood gitlab at mg.gitlab.com
Sun May 24 04:22:55 UTC 2020



Mark Atwood pushed to branch master at NTPsec / ntpsec


Commits:
07bd1297 by Mark Atwood at 2020-05-23T21:22:44-07:00
update and fix the release process notes

- - - - -


3 changed files:

- LICENSE.adoc
- devel/hacking.adoc
- devel/release


Changes:

=====================================
LICENSE.adoc
=====================================
@@ -1,5 +1,9 @@
 = Software licenses =
 
+By submitting patches to this project you agree to allow them to be
+redistributed under the project's license, according to the normal
+forms and usages of the open-source community.
+
 For historical reasons the code in this distribution is issued under
 several different but compatible licenses.  Each will generally be
 found near a year or years of copyright declaration.


=====================================
devel/hacking.adoc
=====================================
@@ -537,7 +537,7 @@ Our GitLab group is at https://gitlab.com/groups/NTPsec
 Please use the issue tracker and the pull request process at GitLab.com.
 
 If you wish, you can request to join the GitLab project team at
-https://gitlab.com/groups/NTPsec/group_members, and we will add you to the
+https://gitlab.com/groups/NTPsec/group_members and we will add you to the
 team with Guest access; this will cause GitLab to send issue tracker
 updates and pipeline updates to your email address.  You do not have
 to formally be a member of the GitLab team to participate, contribute,
@@ -570,7 +570,9 @@ The team member who merges your patch will use the git
 parameter ---author from the email From header and the git parameter
 --date from the email Date header.
 
-For complex patches and contribution narratives, please use GitLab.
+We recommend you consult http://esr.ibiblio.org/?p=6802
+
+For complex patches and contribution narratives, do please use GitLab.
 
 == Commit comments
 
@@ -678,10 +680,6 @@ each release.
   by landing a significant new feature, landing a critical fix, or just
   that enough time has passed with ongoing improvements and fixes.
 
-. Make sure inclusions (currently only libaes_siv) are updated, and
-  run the build as a sanity check.  There's a 'pullincludes' target
-  in waf that refreshes the includes. Commit that change.
-
 . Email a warning message to the mailto:devel at ntpsec.org list,
   and ask the major contributors to chime in, and to each assure
   that the .../NEWS file and the .../devel/TODO file is up to date.
@@ -693,10 +691,12 @@ each release.
 . Check with the buildbot reports, assure that there are no unplanned
   regressions on the supported platforms.
 
+. Do the "Release Prep Steps" section below.
+
 . Modify the .../VERSION file with the new version number.
   Version number strings look like "1.1.1"
 
-. Modify the .../NEWS file, changing the "Repository head"
+. Modify the .../NEWS.adoc file, changing the "Repository head"
   to the current date and the version string.
 
 . Run ./waf configure
@@ -705,35 +705,64 @@ each release.
 
 . cd ./devel
 
-. Run the "release" script in this (devel) directory.
+. Run the "./release | sh" script in this (devel) directory.
+
+. Check https://gitlab.com/NTPsec/ntpsec
+
+. Post release announcement to blog.ntpsec.org
 
-. Post release announcement to blog
+. Post release announcement to fediverse @ntpsec at fosstodon.org
 
 . Post release announcement to email announce at ntpsec.org, devel at ntpsec.org, gpsd-dev at nongnu.org, ntp at ietf.org, time-nuts at lists.febo.com
 
-== Release Prep Steps.  Ignore this if you are not Mark
+. Modify the .../NEWS.adoc file, adding a new "Repository head" section.
 
-. start a new Debian instance, note it's public IP address
+
+== Release Prep Steps.  Ignore this if you are not Mark.
+
+. start a new Debian instance, at least 256GiB, note the public IP address
+
+. add/update local .ssh/config
+
+-------------------------------------------------------------
+Host builder
+  Hostname IPADDRESS
+  User admin
+  IdentityFile ~/.ssh/aws-mra.key
+-------------------------------------------------------------
+
+. ssh to it, then disconnect, to test and set ssh fingerprint
+
+-------------------------------------------------------------
+ssh -v builder
+-------------------------------------------------------------
 
 . copy over keys
 
-scp ~/.ssh/gitlab.key  admin at IPADDRESS:.ssh/gitlab.key
+-------------------------------------------------------------
+scp ~/.ssh/gitlab.key  builder:.ssh/gitlab.key
 gpg --export-secret-key 0x5A22E330161C3978 >secret.gkey
-scp secret.gkey admin at IPADDRESS:.
+scp secret.gkey builder:.
+-------------------------------------------------------------
 
 . ssh to remote
 
-ssh -v -i ~/.ssh/aws-mra.key admin at IPADDRESS
+-------------------------------------------------------------
+ssh builder
+-------------------------------------------------------------
 
 . install build dependencies
 
+-------------------------------------------------------------
 sudo apt-get update
 sudo apt-get install build-essential m4 bison git gnupg libssl-dev emacs-nox python-pip
 sudo apt-get install asciidoc xsltproc
 sudo pip install gps
+-------------------------------------------------------------
 
-. connect to gitlab
+. setup gitlab ssh
 
+-------------------------------------------------------------
 cat >> ~/.ssh/config
 Host gitlab.com
   Hostname gitlab.com
@@ -742,25 +771,44 @@ Host gitlab.com
   PreferredAuthentications publickey
   IdentityFile ~/.ssh/gitlab.key
 ^D
+-------------------------------------------------------------
+
+. test gitlab ssh, set ssh fingerprint, expect welcome string
+
+-------------------------------------------------------------
+ssh -v git at gitlab.com
+-------------------------------------------------------------
+
+. connect to ftp mirror, set ssh fingerprint, then disconnect
 
-ssh git at gitlab.com  # expect "Welcome to GitLab, @fallenpegasus!"
+-------------------------------------------------------------
+ssh -v markatwood at service1.ntpsec.org
+-------------------------------------------------------------
 
 . clone the repo
 
+-------------------------------------------------------------
 git clone git at gitlab.com:NTPsec/ntpsec.git
+-------------------------------------------------------------
 
 . setup the signing key and init gpg
 
+-------------------------------------------------------------
 gpg --import ~/secret.gkey
 GPG_TTY=$(tty); export GPG_TTY
 echo "test" | gpg --clearsign
+-------------------------------------------------------------
 
 . setup gitconfig
 
+-------------------------------------------------------------
 cat > ~/.gitconfig
 [user]
         name = Mark Atwood
         email = mark.atwood at ntpsec.org
 ^D
+-------------------------------------------------------------
+
+. 
 
 //end


=====================================
devel/release
=====================================
@@ -41,7 +41,7 @@ git push --tags
 gpg -u ${KEY} -a --output ${TAR}.asc --detach-sign ${TAR}
 
 # Generate sha256sum file for the release tarball.
-shasum -a 256 -p ${TAR} >${TAR}.sum
+shasum -a 256 ${TAR} >${TAR}.sum
 
 # GPG sign that sha256sum file.
 gpg -u ${KEY} -a --output ${TAR}.sum.asc --clearsign ${TAR}.sum
@@ -50,7 +50,6 @@ gpg -u ${KEY} -a --output ${TAR}.sum.asc --clearsign ${TAR}.sum
 # tarball, and the signed sha256sum file to the ftp artifact server.
 scp ntpsec-${V}.tar* ${DST}
 
-echo "Don't forget to bump the minor version number!"
 EOF
 
 # end



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/07bd12978f042d83659899a88d136cb07a9951df

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/07bd12978f042d83659899a88d136cb07a9951df
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20200524/8126729f/attachment-0001.htm>


More information about the vc mailing list