Merge pull request #1461 from evgenyz/maint-1.3

Fixes for the release scripts. Release guide updates.

Author: jan-cerny

release_tools/README.adoc

@@ -49,12 +49,22 @@ Update the `AUTHORS` file for missing authors and the `naming.sh` file if there
 +
 Use it to update the `NEWS` file and commit it.
 +
-The last commit before the release has to have the `openscap-<version>` message (e.g. `openscap-1.2.17`).
+The last commit before the release has to have the `openscap-<version>` message (e.g. `openscap-1.3.2`).
+
+. Create tarballs and GitHub release.
++
+In a clean copy of the release branch run `cmake .. && make package_source` in the `build` directory.
++
+Create new GitHub release with the name of the vesrion (e.g. 1.3.2) being released.
++
+Add relevant part of the NEWS file as a release description. 
++
+Attach `openscap-X.Y.Z.tar.gz` and `openscap-X.Y.Z.tag.gz.sha512` files to the GH release, created against the release tag.
 
 . Run `new-release.sh`.
 +
 This will create and push version tags, create new GitHub release and handle milestones swap.
-Finally, it will bump version numbers in `versions.sh` to be ready for the next upstream release.
+Finally, it will bump version numbers in `versions.sh` to be ready for the next (e.g. 1.3.3) upstream release.
 
 . Build OpenSCAP for Windows
 +

release_tools/release.sh

@@ -355,7 +355,7 @@ upload_to_git()
 # $3: The new version
 flip_milestones()
 {
-    "./$SCRIPT_DIR/move-milestones.py" --owner "$2" --api-token "$1" "$version" "$3"
+    "$SCRIPT_DIR/move-milestones.py" --owner "$2" --auth-token "$1" "$version" "$3"
 }
 
 
@@ -414,6 +414,6 @@ release_to_git_and_bump_release()
     check_release_is_ok
     release_to_git
     # upload_to_git  # to be done when https://github.com/PyGithub/PyGithub/pull/525 is merged.
-    flip_milestones --auth-token "$GITHUB_TOKEN" openscap "$_new_version"
+    flip_milestones "$GITHUB_TOKEN" openscap "$_new_version"
     bump_release "$_new_version"
 }