Review

Author: DavidSouther

README.md

@@ -89,8 +89,8 @@ There are two stages, testing and deployment.
 
 1. **Update the -tools version**: Once the tests pass, update the `setup.py` version and create a tag in the -tools repository at the same SHA you identified earlier.
 
-  - Determine the next [stamp](https://blog.aspect.build/versioning-releases-from-a-monorepo) (which is valid [semver](https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers)) number as appropriate for the changes in this release. e.g. `2024.40.2`.
-  - Run `stamp.sh` to automatically perform this action. Use `--release` to additionally create a tag and push to main.
+  - Run `stamp.sh` to determine the next version and update `setup.py`. Use `--release` to additionally create a tag and push to main.
+    - Determine the next [stamp](https://blog.aspect.build/versioning-releases-from-a-monorepo) (which is valid [semver](https://packaging.python.org/en/latest/specifications/version-specifiers/#version-specifiers)) number as appropriate for the changes in this release. e.g. `2024.40.2`.
 
 1. **Update your testing PR branch**: Remove SHA and add tag to [validate-doc-metadata.yml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.github/workflows/validate-doc-metadata.yml)
    - NOTE: Remove the SHA from [.doc_gen/validation.yaml](https://github.com/awsdocs/aws-doc-sdk-examples/blob/main/.doc_gen/validation.yaml)

stamp.sh

@@ -7,20 +7,20 @@ set -e # Exit on errors
 BRANCH=$(git rev-parse --abbrev-rev HEAD)
 if [ "$BRANCH" != "main" ] ; then 
     echo "Not on main, exiting!" 
-    # exit 1
+    exit 1
 fi 
 
 # And check that the main branch is clean
 STATUS=$(git status --porcelain)
 if [ -n "${STATUS}" ] ; then
     echo "Repository is not clean, exiting!" 
-    # exit 1
+    exit 1
 fi 
 
 # And check that the REMOTE points to the -tools repo.
-REMOTE="${REMOTE:origin}"
-if [ "$(git remote get-url $REMOTE 2>/dev/null)" != "[email protected]:awsdocs/aws-doc-sdk-examples-tools.git" ] ; then
-    echo "REMOTE=${REMOTE} is not set to [email protected]:awsdocs/aws-doc-sdk-examples-tools.git, please adjust accordingly and rerun."
+REMOTE="${REMOTE:-origin}"
+if [[ "$(git remote get-url $REMOTE 2>/dev/null)" != *"awsdocs/aws-doc-sdk-examples-tools.git"* ]] ; then
+    echo "REMOTE=${REMOTE} is not set to awsdocs/aws-doc-sdk-examples-tools.git, please adjust accordingly and rerun."
     exit 1
 fi
 
@@ -50,7 +50,7 @@ CURRENT=$(grep version= setup.py | awk -F\" '{print $2}')
 NEXT=$(date +%Y.%W.0)
 VERSION=$(compare_versions "$CURRENT" "$NEXT")
 echo "Releasing $VERSION..."
-sed -i '' "/version=/ s/$CURRENT/$VERSION/" setup.py
+sed "/version=/ s/$CURRENT/$VERSION/" setup.py > setup.py.out ; mv setup.py.out setup.py
 git --no-pager diff
 git add setup.py
 git commit --message "Release ${VERSION}"