Changeset 12587

Timestamp:

05/16/2023 05:12:07 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: Release Confirmations: Allow for releases to be confirmed (and built), that are not the stable version.

See #5352.
See #5901.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• cli/class-import.php (modified) (3 diffs)
• email/class-release-confirmation.php (modified) (1 diff)

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

@@ -90 +90 @@
                         }
 
+                        // Check to see if the commit has touched tags that don't have known confirmed releases.
+                        foreach ( $svn_changed_tags as $svn_changed_tag ) {
+                                if ( 'trunk' === $svn_changed_tag ) {
+                                        continue;
+                                }
+
+                                $release = Plugin_Directory::get_release( $plugin, $svn_changed_tag );
+                                if ( ! $release ) {
+                                        // Use the actual version for stable releases, otherwise fallback to the tag name, as we don't have the actual header data.
+                                        $version = ( $svn_changed_tag === $stable_tag ) ? $headers->Version : $svn_changed_tag;
+
+                                        Plugin_Directory::add_release(
+                                                $plugin,
+                                                [
+                                                        'tag'       => $svn_changed_tag,
+                                                        'version'   => $version,
+                                                        'committer' => [ $last_committer ],
+                                                        'revision'  => [ $last_revision ]
+                                                ]
+                                        );
+
+                                        $email = new Release_Confirmation_Email(
+                                                $plugin,
+                                                Tools::get_plugin_committers( $plugin_slug ),
+                                                [
+                                                        'who'     => $last_committer,
+                                                        'readme'  => $readme,
+                                                        'headers' => $headers,
+                                                        'version' => $version,
+                                                ]
+                                        );
+                                        $email->send();
+
+                                        echo "Plugin release {$svn_changed_tag} not confirmed; email triggered.\n";
+                                }
+                        }
+
+                        // Now check to see if the stable has been confirmed.
                         $release = Plugin_Directory::get_release( $plugin, $stable_tag );
-
-                        // This tag is unknown? Trigger email.
                         if ( ! $release ) {
-                                Plugin_Directory::add_release(
-                                        $plugin,
-                                        [
-                                                'tag'       => $stable_tag,
-                                                'version'   => $headers->Version,
-                                                'committer' => [ $last_committer ],
-                                                'revision'  => [ $last_revision ]
-                                        ]
-                                );
-
-                                $email = new Release_Confirmation_Email(
-                                        $plugin,
-                                        Tools::get_plugin_committers( $plugin_slug ),
-                                        [
-                                                'who'     => $last_committer,
-                                                'readme'  => $readme,
-                                                'headers' => $headers,
-                                        ]
-                                );
-                                $email->send();
-
-                                throw new Exception( 'Plugin release not confirmed; email triggered.' );
+                                throw new Exception( "Plugin release {$stable_tag} not found." );
                         }
 
@@ -131 +146 @@
                                 Plugin_Directory::add_release( $plugin, $release );
 
-                                throw new Exception( 'Plugin release not confirmed.' );
+                                throw new Exception( "Plugin release {$stable_tag} not confirmed." );
                         }
 
@@ -373 +388 @@
                                 $release = Plugin_Directory::get_release( $plugin, $tag );
 
-                                if ( ! $release || ( $release['zips_built'] && $release['confirmations_required'] ) ) {
+                                if ( ! $release || ! $release['confirmed'] || $release['zips_built'] ) {
                                         unset( $versions_to_build[ $i ] );
                                 } else {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-release-confirmation.php

@@ -35 +35 @@
                         $this->user_text( $this->args['who'] ),
                         $this->args['readme']->name,
-                        $this->args['headers']->Version,
+                        $this->args['version'] ?? $this->args['headers']->Version,
                         esc_url( Release_Confirmation_Shortcode::generate_access_url( $this->user ) )
                 );