Fix automated release process

Author: stefanmaric

CHANGELOG.md

@@ -24,6 +24,7 @@
 - Add automated release process
 - Ensure smoke tests use local scripts for bootstrap URLs
 - Improve install and download output layouts
+- Fix automated release process
 
 ## 0.10.0 - 2023-06-10
 

bin/release

@@ -92,11 +92,13 @@ validate_release_request() {
   git diff --quiet -- bin/g CHANGELOG.md \
     || die "bin/g or CHANGELOG.md has uncommitted changes"
 
-  git rev-parse -q --verify "refs/tags/$version" > /dev/null \
-    && die "tag already exists: $version"
+  if git rev-parse -q --verify "refs/tags/$version" > /dev/null; then
+    die "tag already exists: $version"
+  fi
 
-  gh release view "$version" > /dev/null 2>&1 \
-    && die "release already exists: $version"
+  if gh release view "$version" > /dev/null 2>&1; then
+    die "release already exists: $version"
+  fi
 }
 
 prepare_release_files() {
@@ -150,6 +152,7 @@ prepare_release_files() {
       }
     }
   ' bin/g > bin/g.tmp
+  chmod +x bin/g.tmp
   mv bin/g.tmp bin/g
 
   awk -v version="$version" '
@@ -173,17 +176,26 @@ prepare_release_files() {
 validate_release_files() {
   make format
   make lint
+}
+
+validate_source_files() {
+  make format
+  make lint
   make test
 }
 
 commit_and_tag_release() {
+  git add bin/g CHANGELOG.md
+
   if [ -n "${GITHUB_ACTIONS:-}" ]; then
-    git config user.name 'github-actions[bot]'
-    git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+    git \
+      -c user.name='github-actions[bot]' \
+      -c user.email='41898282+github-actions[bot]@users.noreply.github.com' \
+      commit -m "$version"
+  else
+    git commit -m "$version"
   fi
 
-  git add bin/g CHANGELOG.md
-  git commit -m "$version"
   git tag -a "$version" -F release-notes.md
   git push origin "HEAD:$(current_branch)" "$version"
 }
@@ -218,6 +230,7 @@ require_command make
 
 validate_version "$version"
 validate_release_request
+validate_source_files
 prepare_release_files
 validate_release_files
 commit_and_tag_release

tests/metadata.t

@@ -62,7 +62,7 @@ test_expect_success 'create mock Go archive' '
 
 test_expect_success 'g accepts exact GOPATH bin PATH entry' '
   output=$(run_with_path "$GOPATH/bin:$mock_path:/bin:/usr/bin" "$g_bin --version") &&
-  test "$output" = "0.10.0"
+  echo "$output" | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$"
 '
 
 test_expect_success 'g rejects substring-only GOPATH bin PATH entry' '

tests/smoke.t

@@ -85,7 +85,7 @@ test_expect_success 'install script configures g' '
 
 test_expect_success 'g reports its version' '
   output=$(run_with_g_env "g --version") &&
-  test "$output" = "0.10.0"
+  echo "$output" | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$"
 '
 
 test_expect_success 'go is installed by g and present on PATH' '