Merge remote-tracking branch 'origin/trunk' into prerelease

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12239457541 Upstream-Ref: Automattic/jetpack@ee4f963
Automattic · Dec 9, 2024 · 319dbce · 319dbce
1 parent 63390e7
commit 319dbce
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/files/autorelease.sh b/.github/files/autorelease.sh
@@ -28,6 +28,11 @@ elif [[ "$GITHUB_REF" == "refs/heads/trunk" ]]; then
 	fi
 	ROLLING_MODE=true
 	CURRENT_VER=$( sed -nEe 's/^## \[?([^]]*)\]? - .*/\1/;T;p;q' CHANGELOG.md || true )
+	if [[ "$CURRENT_VER" != *-alpha ]]; then
+		# Bump a non-alpha release to the next alpha to avoid confusing version_compare.
+		CURRENT_VER=${CURRENT_VER%%-*}
+		CURRENT_VER=${CURRENT_VER%.*}.$(( ${CURRENT_VER##*.} + 1 ))-alpha
+	fi
 	GIT_SUFFIX=$( git log -1 --format="%ct.g%h" . )
 	TAG="$CURRENT_VER+rolling.$GIT_SUFFIX"
 else