Changeset 13959

Timestamp:

08/09/2024 07:12:35 AM (5 weeks ago)

Author:

dd32

Message:

Plugin Directory: Release Confirmation: Remove releases for deleted tags earlier.

When a SVN tag is removed the relevant release is deleted [13711], but that only applied when release confirmation was enabled.

As of the changes in #7696 releases now exist even if release confiramtion isn't enabled, as such as should always remove any release meta for any non-explicitely-confirmed releases.

This also has the effect of resolving an edge-case where the deleted tag is present within trunk/readme.txt as the Stable Tag but the release was discarded/not-confirmed, in that case $stable_tag would be set to the fallback value of 'trunk' for the SVN import and ultimately release confirmation would reject the import (as trunk is not currently valid for that scenario).
That would cause the release NOT to be deleted, although the tag was. Replacing the tag with the corrected data would not re-trigger the confirmation process if the release was previously discarded.

See #7696, #5900.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -154 +154 @@
         unset( $_requires_plugins, $unmet_dependencies );
 
+        /*
+         * If a tag has been deleted, we should also remove any unconfirmed releases.
+         * NOTE: remove_release() will not remove a confirmed release, but will remove a discarded release.
+         *
+         * Additionally; this must occur before the below release confirmation checks,
+         * if the trunk readme has it's stable_tag set to one of these deleted (now non-existent) tags,
+         * then $stable_tag will be set to the fallback 'trunk', causing the RC checks to fail.
+         */
+        foreach ( $svn_tags_deleted as $svn_deleted_tag ) {
+            if ( Plugin_Directory::remove_release( $plugin, $svn_deleted_tag ) ) {
+                echo "Plugin tag {$svn_deleted_tag} deleted; release removed.\n";
+            }
+        }
+
         // Release confirmation
         if ( $plugin->release_confirmation ) {
+            // If the stable tag is trunk, we shouldn't continue, as we don't support that for RC.
             if ( 'trunk' === $stable_tag ) {
                 throw new Exception( 'Plugin cannot be released from trunk due to release confirmation being enabled.' );
@@ -206 +221 @@
 
                     echo "Plugin release {$svn_changed_tag} not confirmed; email triggered.\n";
-                }
-            }
-
-            // Check to see if any of the releases were deleted.
-            foreach ( $svn_tags_deleted as $svn_deleted_tag ) {
-                // Note: Confirmed releases will not be deleted, only unconfirmed ones.
-                if ( Plugin_Directory::remove_release( $plugin, $svn_deleted_tag ) ) {
-                    echo "Plugin tag {$svn_deleted_tag} deleted; release removed.\n";
                 }
             }