Merge pull request #227 from maxmind/greg/eng-1733

Improve release script reliability (ENG-1733)

Author: horgh

.github/workflows/test.yml

@@ -10,20 +10,20 @@ permissions: {}
 
 jobs:
   run:
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.runner }}
     container: shivammathur/node:latest-${{ matrix.arch }}
     strategy:
       matrix:
-        arch: ["amd64", "i386"]
-        operating-system: [ubuntu-latest]
+        arch: ["amd64", "arm64v8"]
         php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         php-extension: ['bcmath', 'gmp']
-        exclude:
-          # We are getting weird libxml2 failures on this combo
-          - arch: "i386"
-            php-version: 8.4
+        include:
+          - arch: amd64
+            runner: ubuntu-latest
+          - arch: arm64v8
+            runner: ubuntu-24.04-arm
 
-    name: "PHP ${{ matrix.php-version }} (with ${{ matrix.php-extension }}) test on ${{ matrix.operating-system }}/${{ matrix.arch }}"
+    name: "PHP ${{ matrix.php-version }} (with ${{ matrix.php-extension }}) test on ${{ matrix.runner }}"
     steps:
       - name: Install PHP
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0

dev-bin/release.sh

@@ -2,6 +2,39 @@
 
 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 php
+check_command phpize
+check_command pecl
+
 # Check that we're not on the main branch
 current_branch=$(git branch --show-current)
 if [ "$current_branch" = "main" ]; then
@@ -23,23 +56,23 @@ fi
 changelog=$(cat CHANGELOG.md)
 
 regex='
-([0-9]+\.[0-9]+\.[0-9]+) \(([0-9]{4}-[0-9]{2}-[0-9]{2})\)
+([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?) \(([0-9]{4}-[0-9]{2}-[0-9]{2})\)
 -*
 
 ((.|
 )*)
 '
 
 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')"
+date="${BASH_REMATCH[3]}"
+notes="$(echo "${BASH_REMATCH[4]}" | sed -n -E '/^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?/,$!p')"
 
-if [[ "$date" !=  $(date +"%Y-%m-%d") ]]; then
+if [[ "$date" != "$(date +"%Y-%m-%d")" ]]; then
     echo "$date is not today!"
     exit 1
 fi
@@ -87,7 +120,7 @@ pecl package
 
 package="maxminddb-$version.tgz"
 
-read -p "Push to origin? (y/n) " should_push
+read -r -p "Push to origin? (y/n) " should_push
 
 if [ "$should_push" != "y" ]; then
     echo "Aborting"
@@ -126,13 +159,13 @@ if [ ! -d "$ext_repo_dir" ]; then
 fi
 
 # Navigate to extension repository
-pushd "$ext_repo_dir" > /dev/null
+pushd "$ext_repo_dir" >/dev/null
 
 # Safety check: ensure working directory is clean
 if [ -n "$(git status --porcelain)" ]; then
     echo "ERROR: Extension repository has uncommitted changes"
     echo "Please commit or stash changes in: $ext_repo_dir"
-    popd > /dev/null
+    popd >/dev/null
     exit 1
 fi
 
@@ -155,7 +188,7 @@ git checkout "$tag"
 
 if [ $? -ne 0 ]; then
     echo "ERROR: Failed to checkout tag $tag in submodule"
-    popd > /dev/null
+    popd >/dev/null
     exit 1
 fi
 
@@ -167,7 +200,7 @@ git add MaxMind-DB-Reader-php
 # Check if there are actual changes
 if [ -z "$(git status --porcelain)" ]; then
     echo "No changes needed in extension repository (already at $tag)"
-    popd > /dev/null
+    popd >/dev/null
     echo "Extension repository is up to date"
 else
     # Commit submodule update
@@ -185,7 +218,7 @@ $notes"
 
     if [ $? -ne 0 ]; then
         echo "ERROR: Failed to push to extension repository"
-        popd > /dev/null
+        popd >/dev/null
         exit 1
     fi
 
@@ -196,13 +229,13 @@ $notes"
 
     # Create tarball with files at root level (PIE requirement)
     # Note: naming must be {extension-name}-v{version}.tgz
-    pushd MaxMind-DB-Reader-php/ext > /dev/null
+    pushd MaxMind-DB-Reader-php/ext >/dev/null
     tar -czf "../../$pie_tarball" *
-    popd > /dev/null
+    popd >/dev/null
 
     if [ ! -f "$pie_tarball" ]; then
         echo "ERROR: Failed to create source tarball"
-        popd > /dev/null
+        popd >/dev/null
         exit 1
     fi
 
@@ -226,7 +259,7 @@ $notes" \
         echo "ERROR: Failed to create release in extension repository"
         echo "You may need to create it manually at:"
         echo "https://github.com/maxmind/MaxMind-DB-Reader-php-ext/releases/new?tag=$tag"
-        popd > /dev/null
+        popd >/dev/null
         exit 1
     fi
 
@@ -239,7 +272,7 @@ $notes" \
     echo "✓ Pre-packaged source uploaded: $pie_tarball"
 fi
 
-popd > /dev/null
+popd >/dev/null
 
 echo ""
 echo "==================================================================="