Toward CRM-15762: Handle status changes for older versions; and fix bug updating...

diff --git a/tools/scripts/releaser/releaser b/tools/scripts/releaser/releaser
index 301767c85e81663f12621e9a430e7302e603e781..41b5cae905da2df061ad621b2c3547aa948b499e 100755 (executable)
--- a/tools/scripts/releaser/releaser
+++ b/tools/scripts/releaser/releaser
@@ -220,24 +220,53 @@ function do_publish_versions() {
   json=`cat $latest/versions.json`
 
   # Ask for the status of this release.
-  prompt status "What is the status of the major version for this release?" testing stable lts eol
+  prompt status "What is the status of the major version for this release?" testing stable lts
 
-  # If this is a stable release, check for another existing stable release, and
-  # if one is found, ask what status to assign to that other release.
-  if [[ "$status" == "stable" ]]; then
-    current_stable_version=$(php -r "
+  # Rather complex steps to reconcile new release status with previous releases.
+  if [[ "$status" == "lts" ]]; then
+    # If it's LTS, ask what status to use for the current LTS, if any.
+    older_lts_version=$(php -r "
       require 'releaser_json.php';
-      print_current_stable_version('$json');
+      print_previous_status_version('$json', 'lts', '$major_version');
     ")
-
-    if [[ "$major_version" != "$current_stable_version" ]]; then
-      prompt new_status_for_previous_stable "Since this release is stable, what should be the new status for the current stable version ($current_stable_version)?" testing lts eol
-
+    if [[ -n "$older_lts_version" ]]; then
+      prompt new_status_for_older_lts "Since this release is lts, what should be the new status for the current lts version ($older_lts_version)?" lts eol
+      # Assign the selected status to the current LTS version.
       json=$(php -r "
         require 'releaser_json.php';
-        update_version_status('$json', '$current_stable_version', '$new_status_for_previous_stable');
+        update_version_status('$json', '$older_lts_version', '$new_status_for_older_lts');
       ")
     fi
+  elif [[ "$status" == "stable" ]]; then
+    # If it's stable, ask what status to use for the current stable, if any.
+    older_stable_version=$(php -r "
+      require 'releaser_json.php';
+      print_previous_status_version('$json', 'stable', '$major_version');
+    ")
+    if [[ -n "$older_stable_version" ]]; then
+      prompt new_status_for_older_stable "Since this release is stable, what should be the new status for the current stable version ($older_stable_version)?" stable lts eol
+      # Assign the selected status to the current stable version.
+      json=$(php -r "
+        require 'releaser_json.php';
+        update_version_status('$json', '$older_stable_version', '$new_status_for_older_stable');
+      ")
+      if [[ "$new_status_for_older_stable" == "lts" ]]; then
+        # But now, if we've bumped 'stable' to 'lts', we have to ask what status
+        # to use for an older existing LTS release, if any.
+        older_lts_version=$(php -r "
+          require 'releaser_json.php';
+          print_previous_status_version('$json', 'lts', '$older_stable_version');
+        ")
+        if [[ -n "$older_lts_version" ]]; then
+          prompt new_status_for_older_lts "Since $older_stable_version is now lts, what should be the new status for the current lts version ($older_lts_version)?" lts eol
+          # Assign the selected status to the older existing LTS release.
+          json=$(php -r "
+            require 'releaser_json.php';
+            update_version_status('$json', '$older_lts_version', '$new_status_for_older_lts');
+          ")
+        fi
+      fi
+    fi
   fi
 
   # Ask if this is a security release.
@@ -248,7 +277,13 @@ function do_publish_versions() {
     is_security="false"
   fi
 
-  # Add new release to JSON data.
+  # Update status for this release's major version.
+  json=$(php -r "
+    require 'releaser_json.php';
+    update_version_status('$json', '$major_version', '$status');
+  ")
+
+  # Add the new release to JSON data.
   release_date=$(date +%Y-%m-%d);
   # Create json string for release properties; `tr` is just to let us use
   # (json-invalid) single quotes, which are easier to read in bash.

diff --git a/tools/scripts/releaser/releaser_json.php b/tools/scripts/releaser/releaser_json.php
index d1915ce5a4d2987d4748da32729e8b2e43e78e13..dff8019bb5e1d309aa652250527a54d944ec65c7 100644 (file)
--- a/tools/scripts/releaser/releaser_json.php
+++ b/tools/scripts/releaser/releaser_json.php
@@ -5,18 +5,28 @@
 
 
 /**
- * Analyze the given json data to find the current stable major version string,
- * and print that major version string to STDOUT.
+ * Analyze the given json data to find the latest major version which a) has the
+ * given status, and b) is older than the given major version, and print that
+ * major version string to STDOUT.
  *
  * @param string $json JSON string from latest.civicrm.org/versions.json
+ * @param string $status A status to search for, e.g., 'stable', 'lts'
+ * @param string $compare_version A version string, which must be newer than
+ *  any matching version string.
+ *
  * @return void
  */
-function print_current_stable_version($json) {
+function print_previous_status_version($json, $status, $compare_version) {
   $versions = json_decode($json, TRUE);
-  foreach ($versions as $major_version => $version) {
-    if ($version['status'] == 'stable') {
-      echo $major_version;
-      return;
+  $major_versions = array_keys($versions);
+  usort($major_versions, 'version_compare');
+  $sorted_major_versions = array_reverse($major_versions);
+  foreach ($sorted_major_versions as $major_version) {
+    if (version_compare($major_version, $compare_version) == -1) {
+      if ($versions[$major_version]['status'] == $status) {
+        echo $major_version;
+        return;
+      }
     }
   }
 }
@@ -30,6 +40,8 @@ function print_current_stable_version($json) {
  * @param string $release_properties_json JSON string containing properties
  *  for the new release, as seen in latest.civicrm.org/versions.json
  *  {$major_version:{'releases':[$release_properties_json]}}
+ *
+ * @return Void
  */
 function add_release($json, $major_version, $release_properties_json) {
   $versions = json_decode($json, TRUE);
@@ -51,6 +63,8 @@ function add_release($json, $major_version, $release_properties_json) {
  * @param string $major_version A major version string, e.g. 1.1
  * @param string $status The correct status for the major version, e.g.,
  *  'stable', 'eol'
+ *
+ * @return Void
  */
 function update_version_status($json, $major_version, $status) {
   $versions = json_decode($json, TRUE);