Skip to content

Commit

Permalink
Tighten up several checks.
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidSouther committed Oct 1, 2024
1 parent 3264a53 commit 76cfcb9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name="aws_doc_sdk_examples_tools",
version="2024.40.2",
version="2024.40.0",
packages=["aws_doc_sdk_examples_tools"],
package_data={"aws_doc_sdk_examples_tools": ["config/*.yaml"]},
entry_points={
Expand Down
27 changes: 15 additions & 12 deletions stamp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,26 @@ if [ -n "${STATUS}" ] ; then
# exit 1
fi

# VERSION and DATE have the format YYYY.WW.REV, where YYYY is the current year,
# 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."
exit 1
fi

# CURRENT and NEXT have the format YYYY.WW.REV, where YYYY is the current year,
# WW is the current week, and REV is the number of releases this week.
# The next revision compares the two, in this way
# - If DATE is later than VERSION in all fields, accept date.
# - Otherwise, return VERSION, with one added to REV.
# - If NEXT is later than CURRENT in any fields, accept NEXT.
# - Otherwise, return CURRENT, with one added to REV.
#
# THIS FUNCTION IS NOT TRANSITIVE! It must be called with
# `compare_versions CURRENT NEXT`
compare_versions() {
IFS='.' read -r y1 w1 r1 <<< "$1"
IFS='.' read -r y2 w2 r2 <<< "$2"

if [ "$y1" -lt "$y2" ] || \
[ "$w1" -lt "$w2" ] || \
[ "$r1" -lt "$r2" ]; then
if [[ "$1" < "$2" ]] ; then
echo "$2"
else
IFS='.' read -r y1 w1 r1 <<< "$1"
r1=$((r1 + 1))
echo "${y1}.${w1}.${r1}"
fi
Expand All @@ -53,7 +56,7 @@ git add setup.py
git commit --message "Release ${VERSION}"

if [ "$1" == "--release" ] ; then
git tag $VERSION main
git push origin $VERSION
git push origin main
git tag "$VERSION" main
git push "$REMOTE" "$VERSION"
git push "$REMOTE" main
fi

0 comments on commit 76cfcb9

Please sign in to comment.