Improved release script

Author: tcmulcahy

kotlin/internal/tool/prepare-release/src/main/java/com/squareup/stoic/preparerelease/Main.kt

@@ -32,7 +32,7 @@ fun main(args: Array<String>) {
     exitProcess(1)
   }
 
-  // TODO: verify git is clean
+  ensureCleanGitRepo(stoicDir)
 
   println("running test/regression-check.sh... (this will take a while)")
   check(ProcessBuilder("$stoicDir/test/regression-check.sh").inheritIO().start().waitFor() == 0)
@@ -58,15 +58,36 @@ fun main(args: Array<String>) {
 
   versionFile.writeText("$postReleaseVersion\n")
 
+  val releaseTag = "v$releaseVersion"
   println(
     """
+      
+      
+      
+      Release version: $releaseVersion
+      Release tag: $releaseTag
       Release prepared successfully: $releaseTar
       Version incremented to: $postReleaseVersion
+      
+      
+      Next steps:
+      
+      # Make sure you're in the right directory
+      cd $stoicDir
+      
+      # tag the release and push it
+      git tag $releaseTag && git push origin $releaseTag
+      
+      # Commit the version bump and push it
+      git add prebuild/STOIC_VERSION && git commit -m "$postReleaseVersion version bump" && git push
+      
+      # Upload the release to Github
+      gh release create $releaseTag $releaseTar --title $releaseTag
+      
+      
+      
     """.trimIndent()
   )
-  // TODO:
-  // prompt the user to commit/push the changes to the version file and
-  //   upload the release
 }
 
 fun validateSemver(version: String): Boolean =
@@ -77,3 +98,18 @@ fun incrementSemver(version: String): String {
   val parts = clean.split(".").map { it.toInt() }
   return "${parts[0]}.${parts[1]}.${parts[2] + 1}-SNAPSHOT"
 }
+
+fun ensureCleanGitRepo(stoicDir: File) {
+  val process = ProcessBuilder("git", "status", "--porcelain")
+    .directory(stoicDir)
+    .redirectErrorStream(true)
+    .start()
+
+  val output = process.inputStream.bufferedReader().readText().trim()
+  process.waitFor()
+
+  if (output.isNotEmpty()) {
+    System.err.println("The git repository has uncommitted changes or untracked files. Aborting...")
+    exitProcess(1)
+  }
+}

prepare-release.sh

@@ -8,7 +8,7 @@ cd "$script_dir"/kotlin
 
 echo
 echo
-echo 'Next steps:'
-echo '1. commit version change and push (git commit -m "version bump" && git push)'
-echo '2. Upload /Users/tomm/Development/stoic/releases/stoic-0.0.2.tar.gz to Github Releases'
+echo 'Release prepared locally.'
+echo 'To actually complete the release, see "Next Steps" above'
+echo
 echo