release-version: clean up release-only files

ctrueden · ctrueden · commit 00b78cbe0dd4 · 2022-09-26T09:07:26.000-05:00
To avoid these becoming committed to the mainline repository branch,
 we now do two things:

1. If they are present at the beginning, remove them.
2. After the release process completes, delete the newly generated ones.
diff --git a/release-version.sh b/release-version.sh
@@ -208,6 +208,21 @@ test "$FETCH_HEAD" = HEAD ||
 test "$FETCH_HEAD" = "$(git merge-base $FETCH_HEAD $HEAD)" ||
 	die "'$defaultBranch' is not up-to-date"
 
+# Check for release-only files committed to the main branch.
+for release_file in release.properties pom.xml.releaseBackup
+do
+	if [ -e "$release_file" ]
+	then
+		echo "=========================================================================="
+		echo "NOTE: $release_file was committed to source control. Removing now."
+		echo "=========================================================================="
+		git rm -rf "$release_file" &&
+		git commit "$release_file" \
+			-m 'Remove $release_file' \
+			-m 'It should only exist on release tags.'
+	fi
+done
+
 # Ensure that schema location URL uses HTTPS, not HTTP.
 if grep -q http://maven.apache.org/xsd/maven-4.0.0.xsd pom.xml >/dev/null 2>/dev/null
 then
@@ -312,5 +327,8 @@ $DRY_RUN git checkout @{-1} &&
 if test -z "$SKIP_PUSH"
 then
 	$DRY_RUN git push "$REMOTE" HEAD $tag
-fi ||
-exit
+fi
+
+# Remove files generated by the release process. They can end up
+# committed to the mainline branch and hosing up later releases.
+$DRY_RUN rm -f release.properties pom.xml.releaseBackup
