From 12b18c1ae329d252907a2bb6a9d8894a250f5960 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 3 Dec 2025 10:09:31 -0800 Subject: [PATCH 1/2] Add pre-flight checks to release script --- dev-bin/release.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dev-bin/release.sh b/dev-bin/release.sh index 32630259..6584c60a 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -2,6 +2,37 @@ set -eu -o pipefail +# Pre-flight checks - verify all required tools are available and configured +# before making any changes to the repository + +check_command() { + if ! command -v "$1" &> /dev/null; then + echo "Error: $1 is not installed or not in PATH" + exit 1 + fi +} + +# Verify gh CLI is authenticated +if ! gh auth status &> /dev/null; then + echo "Error: gh CLI is not authenticated. Run 'gh auth login' first." + exit 1 +fi + +# Verify we can access this repository via gh +if ! gh repo view --json name &> /dev/null; then + echo "Error: Cannot access repository via gh. Check your authentication and repository access." + exit 1 +fi + +# Verify git can connect to the remote (catches SSH key issues, etc.) +if ! git ls-remote origin &> /dev/null; then + echo "Error: Cannot connect to git remote. Check your git credentials/SSH keys." + exit 1 +fi + +check_command perl +check_command mvn + # Check that we're not on the main branch current_branch=$(git branch --show-current) if [ "$current_branch" = "main" ]; then From f4e46a8703f7a9b222d3b6df0ce830835fe7293f Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 3 Dec 2025 13:30:12 -0800 Subject: [PATCH 2/2] Fix release script consistency issues - Quote date command substitution for defensive programming - Apply shfmt formatting --- dev-bin/release.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-bin/release.sh b/dev-bin/release.sh index 6584c60a..eec49397 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -6,26 +6,26 @@ set -eu -o pipefail # before making any changes to the repository check_command() { - if ! command -v "$1" &> /dev/null; then + if ! command -v "$1" &>/dev/null; then echo "Error: $1 is not installed or not in PATH" exit 1 fi } # Verify gh CLI is authenticated -if ! gh auth status &> /dev/null; then +if ! gh auth status &>/dev/null; then echo "Error: gh CLI is not authenticated. Run 'gh auth login' first." exit 1 fi # Verify we can access this repository via gh -if ! gh repo view --json name &> /dev/null; then +if ! gh repo view --json name &>/dev/null; then echo "Error: Cannot access repository via gh. Check your authentication and repository access." exit 1 fi # Verify git can connect to the remote (catches SSH key issues, etc.) -if ! git ls-remote origin &> /dev/null; then +if ! git ls-remote origin &>/dev/null; then echo "Error: Cannot connect to git remote. Check your git credentials/SSH keys." exit 1 fi @@ -62,15 +62,15 @@ regex=' ' if [[ ! $changelog =~ $regex ]]; then - echo "Could not find date line in change log!" - exit 1 + echo "Could not find date line in change log!" + exit 1 fi version="${BASH_REMATCH[1]}" date="${BASH_REMATCH[2]}" notes="$(echo "${BASH_REMATCH[3]}" | sed -n -e '/^[0-9]\+\.[0-9]\+\.[0-9]\+/,$!p')" -if [[ "$date" != $(date +"%Y-%m-%d") ]]; then +if [[ "$date" != "$(date +"%Y-%m-%d")" ]]; then echo "$date is not today!" exit 1 fi @@ -119,7 +119,7 @@ if [ "$should_continue" != "y" ]; then fi page=.gh-pages/index.md -cat < $page +cat <$page --- layout: default title: MaxMind minFraud Java API @@ -134,7 +134,7 @@ mvn versions:set -DnewVersion="$version" perl -pi -e "s/(?<=)[^<]*/$version/" README.md perl -pi -e "s/(?<=com\.maxmind\.minfraud\:minfraud\:)\d+\.\d+\.\d+([\w\-]+)?/$version/" README.md -cat README.md >> $page +cat README.md >>$page git diff