Skip to content

Commit 8e0df86

Browse files
author
Martin Harris
committed
Merge branch 'website' of https://github.com/apache/brooklyn-docs into website-fix-verify-release-artifacts
2 parents a7ad76f + 9a9090a commit 8e0df86

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

developers/committers/release-process/make-release-artifacts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ The release script will:
4646
3. Invoke Maven to build the source code (including running unit tests), and deploy artifacts to a Maven remote
4747
repository
4848
4. Save the .tar.gz and .zip artifacts produced by the build of `brooklyn-dist`
49-
5. For each of the produced files, produce MD5, SHA1, SHA256 and GnuPG signatures
49+
5. For each of the produced files, produce SHA256 and GnuPG signatures
5050

5151
At the end of the script, it will show you the files it has produced and their location.

developers/committers/release-process/prerequisites.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ The following software packages are required during the build. Make sure you hav
4444
- `gnupg2`, and `gnupg-agent` if it is packaged separately (it is on Ubuntu Linux)
4545
- `pinentry` for secure entry of GPG passphrases. If you are building remotely on a Linux machine, `pinentry-curses` is
4646
recommended; building on a mac, `port install pinentry-mac` is recommended.
47-
- `md5sum` and `sha1sum` - these are often present by default on Linux, but not on Mac;
48-
`port install md5sha1sum` should remedy that.
4947
- if `gpg` does not resolve (it is needed for maven), create an alias or script pointing at `gpg2 "$@"`
5048
- the `mmv` command (usually in a package named `mmv`) will help with the final steps of the release process
5149

developers/committers/release-process/publish-temp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mkdir apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
3434
{% endhighlight %}
3535

3636
Copy into this directory all of the artifacts from the previous step - `-src` and `-bin`, `.tar.gz`, `.zip` and `.rpm`,
37-
and all associated `.md5`, `.sha1`, `.sha256` and `.asc` signatures. Then commit:
37+
and all associated `.sha256` and `.asc` signatures. Then commit:
3838

3939
{% highlight bash %}
4040
svn add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}

developers/committers/release-process/publish.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ mkdir apache-brooklyn-${VERSION_NAME}
3333
{% endhighlight %}
3434

3535
Refer back to the pre-release area Subversion (see [Publish to the staging area](publish-temp.html)), and copy all of
36-
the release candidate artifacts - `-src` and `-bin`, `.tar.gz` and `.zip`, and all associated `.md5`, `.sha1`, `.sha256`
36+
the release candidate artifacts - `-src` and `-bin`, `.tar.gz` and `.zip`, and all associated `.sha256`
3737
and `.asc` signatures - into this new folder.
3838

3939
Rename all of the files to remove the `-rcN` designation:
@@ -45,7 +45,7 @@ for f in *; do mv $f ${f//-rc${RC_NUMBER}/}; done
4545
The hash files will need patching to refer to the filenames without the `-rcN` designation:
4646

4747
{% highlight bash %}
48-
sed -i.bak 's/-rc'$RC_NUMBER'-/-/' *.md5 *.sha1 *.sha256
48+
sed -i.bak 's/-rc'$RC_NUMBER'-/-/' *.sha256
4949
rm -f *.bak
5050
{% endhighlight %}
5151

@@ -54,9 +54,7 @@ Note that the PGP signatures do not embed the filename so they do not need to be
5454
As a final check, re-test the hashes and signatures:
5555

5656
{% highlight bash %}
57-
for artifact in $(find * -type f ! \( -name '*.asc' -o -name '*.md5' -o -name '*.sha1' -o -name '*.sha256' \) ); do
58-
md5sum -c ${artifact}.md5 && \
59-
shasum -a1 -c ${artifact}.sha1 && \
57+
for artifact in $(find * -type f ! \( -name '*.asc' -o -name '*.sha256' \) ); do
6058
shasum -a256 -c ${artifact}.sha256 && \
6159
gpg2 --verify ${artifact}.asc ${artifact} \
6260
|| { echo "Invalid signature for $artifact. Aborting!"; break; }
@@ -151,7 +149,7 @@ git checkout master
151149

152150
1. Edit the file `brooklyn-docs/_config.yml` - change `brooklyn-stable-version` to be the newly-release version, and
153151
`brooklyn-version` to be the current SNAPSHOT version on the master branch.
154-
2. Edit the file `brooklyn-docs/website/download/verify.md` to add links to the MD5/SHA1/SHA256 hashes and PGP signatures for the
152+
2. Edit the file `brooklyn-docs/website/download/verify.md` to add links to the SHA256 hashes and PGP signatures for the
155153
new version.
156154
3. Edit the file `brooklyn-docs/website/meta/versions.md` to add the new version.
157155
4. Build the updated site with `./_build/build.sh website-root --install`.

developers/committers/release-process/verify-release-artifacts.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ navgroup: developers
77
Below is described a series of "sanity checks" that should be performed before uploading the artifacts to the
88
pre-release area. They are also useful for community members that want to check the artifact before voting (community
99
members may also want to check the [list of required software packages](prerequisites.html#software-packages) to ensure
10-
they have the GnuPG and md5sum/sha1sum installed.
10+
they have the GnuPG installed.
1111

1212
Setup
1313
-----
@@ -66,7 +66,7 @@ Check that all archives are correctly annotated with license information.
6666
Check NOTICE is included:
6767

6868
{% highlight bash %}
69-
for ARCHIVE in $(find * -type f ! \( -name '*.asc' -o -name '*.md5' -o -name '*.sha1' -o -name '*.sha256' \) ); do
69+
for ARCHIVE in $(find * -type f ! \( -name '*.asc' -o -name '*.sha256' \) ); do
7070
REL_ARCHIVE=${ARCHIVE/-rc?}
7171
case $ARCHIVE in
7272
*.tar.gz)
@@ -102,9 +102,7 @@ Verify the hashes and signatures of artifacts
102102
Then check the hashes and signatures, ensuring you get a positive message from each one:
103103

104104
{% highlight bash %}
105-
for artifact in $(find * -type f ! \( -name '*.asc' -o -name '*.md5' -o -name '*.sha1' -o -name '*.sha256' \) ); do
106-
md5sum -c ${artifact}.md5 && \
107-
shasum -a1 -c ${artifact}.sha1 && \
105+
for artifact in $(find * -type f ! \( -name '*.asc' -o -name '*.sha256' \) ); do
108106
shasum -a256 -c ${artifact}.sha256 && \
109107
gpg2 --verify ${artifact}.asc ${artifact} \
110108
|| { echo "Invalid signature for $artifact. Aborting!"; break; }

0 commit comments

Comments
 (0)