From 116d4b639f31c02b0d1e2e1d96dd52c45038c7b3 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 6 Mar 2021 02:02:25 -0800
Subject: [PATCH] (Cleanup) Upgrader - Remove empty steps from 5.20-series

---
 CRM/Upgrade/Incremental/php/FiveTwentyFive.php    | 2 +-
 CRM/Upgrade/Incremental/php/FiveTwentyNine.php    | 2 +-
 CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl | 1 -
 CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl      | 1 -
 CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl  | 1 -
 15 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl

diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyFive.php b/CRM/Upgrade/Incremental/php/FiveTwentyFive.php
index e7f269ed06..0343d4faab 100644
--- a/CRM/Upgrade/Incremental/php/FiveTwentyFive.php
+++ b/CRM/Upgrade/Incremental/php/FiveTwentyFive.php
@@ -80,7 +80,7 @@ class CRM_Upgrade_Incremental_php_FiveTwentyFive extends CRM_Upgrade_Incremental
   }
 
   public function upgrade_5_25_beta3($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Convert CiviContribute settings', 'updateContributeSettings');
   }
 
diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyNine.php b/CRM/Upgrade/Incremental/php/FiveTwentyNine.php
index 88d392c791..6980067cb2 100644
--- a/CRM/Upgrade/Incremental/php/FiveTwentyNine.php
+++ b/CRM/Upgrade/Incremental/php/FiveTwentyNine.php
@@ -81,7 +81,7 @@ class CRM_Upgrade_Incremental_php_FiveTwentyNine extends CRM_Upgrade_Incremental
    * @param string $rev
    */
   public function upgrade_5_29_beta1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Make label field non required on price field value', 'priceFieldValueLabelNonRequired');
   }
 
diff --git a/CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl
deleted file mode 100644
index 9050d97346..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.20.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl
deleted file mode 100644
index 74eeb66570..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.21.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl
deleted file mode 100644
index 1885f7e76c..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.22.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl
deleted file mode 100644
index dfa1f812b9..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.22.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl
deleted file mode 100644
index c31449ad8c..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.23.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl
deleted file mode 100644
index 1bd826fd83..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.24.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl
deleted file mode 100644
index 10ef3a0996..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.25.0 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl
deleted file mode 100644
index 45c756a3cf..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.25.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl
deleted file mode 100644
index 096e95735d..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.25.beta2 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl
deleted file mode 100644
index 1d9fd478e2..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.25.beta3 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl
deleted file mode 100644
index 3d0a8706e1..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.26.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl
deleted file mode 100644
index c8cf8211db..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.28.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl
deleted file mode 100644
index 4b2bf5addb..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.29.beta1 during upgrade *}
-- 
2.25.1