[1.595.*] Pre-release merge (#1239)

android/build.gradle.kts

@@ -40,7 +40,7 @@ val ziplineDevManifestUrl =
     .gradleProperty("claw.ziplineParserManifestUrl")
     .orElse("http://10.0.2.2:8080/manifest.zipline.json")
     .get()
-val ziplineProdManifestUrl = "https://claw.msfjarvis.dev/current/manifest.zipline.json"
+val ziplineProdManifestUrl = "https://claw.msfjarvis.dev/current/v2/manifest.zipline.json"
 val embeddedZiplineAssetsRoot = layout.buildDirectory.dir("generated/ziplineEmbeddedAssets")
 val embeddedZiplineAssetsRootFile =
   layout.buildDirectory.get().dir("generated/ziplineEmbeddedAssets").asFile

docs/ZIPLINE_UPDATE.md

@@ -1,3 +1,9 @@
+# Releasing a **BREAKING** update for the Zipline module
+
+1. Update the deployment URL and path
+   1. `sd \/current\/$curVer \/current\/$nextVer scripts/deploy-zipline-parser.sh android/build.gradle.kts`
+2. Follow the steps below
+
 # Releasing an update for the Zipline module
 
 1. Set `ZIPLINE_SIGNING_KEY` in environment

scripts/deploy-zipline-parser.sh

@@ -15,8 +15,8 @@ Usage:
 
 Commands:
   release   Create a timestamped release in <target-dir>/releases/<timestamp>
-            and atomically repoint <target-dir>/current to it.
-  rollback  Repoint <target-dir>/current to an existing release timestamp.
+            and atomically repoint <target-dir>/current/v2 to it.
+  rollback  Repoint <target-dir>/current/v2 to an existing release timestamp.
   list      List available release timestamps.
   status    Print the current active release.
   prune     Delete all but the 5 most recent releases. Never deletes the active release.
@@ -71,7 +71,7 @@ release_command() {
 
   tmp_link="${target_dir}/.current.${timestamp}.tmp"
   ln -sfn "${release_dir}" "${tmp_link}"
-  mv -Tf "${tmp_link}" "${target_dir}/current"
+  mv -Tf "${tmp_link}" "${target_dir}/current/v2"
 
   echo "Activated release ${timestamp}"
 }
@@ -87,7 +87,7 @@ rollback_command() {
   [[ -f "${release_dir}/${manifest_name}" ]] || err "release is missing manifest: ${release_dir}/${manifest_name}"
 
   ln -sfn "${release_dir}" "${tmp_link}"
-  mv -Tf "${tmp_link}" "${target_dir}/current"
+  mv -Tf "${tmp_link}" "${target_dir}/current/v2"
 
   echo "Rolled back current release to ${timestamp}"
 }
@@ -103,7 +103,7 @@ list_command() {
 
 status_command() {
   local target_dir="$1"
-  local current_link="${target_dir}/current"
+  local current_link="${target_dir}/current/v2"
 
   require_dir "${target_dir}"
   [[ -L "${current_link}" ]] || err "current release symlink is missing: ${current_link}"
@@ -120,7 +120,7 @@ status_command() {
 prune_command() {
   local target_dir="$1"
   local releases_dir="${target_dir}/releases"
-  local current_link="${target_dir}/current"
+  local current_link="${target_dir}/current/v2"
 
   require_dir "${target_dir}"
   mkdir -p "${releases_dir}"