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

Timestamp:

09/15/2021 07:15:56 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: When release confirmations are enabled, always build the trunk plugin-name.zip zip.

When release confirmations are enabled, trunk can never be set as the stable tag, so it's always safe to build the trunk zip.

There's still a limitation here - If a commit introduces a new stable release AND modifies trunk in the same commit, the trunk ZIP won't be updated until the release is confirmed.
It'd be nice to still rebuild the ZIP in that case, so a follow up change may still be required.

See #5352.
See #5901.

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

@@ -314 +314 @@
      * @param string $plugin_slug            The plugin slug.
      * @param string $stable_tag             The new stable tag.
-     * @param string $current_stable_tag     The new stable tag.
+     * @param string $current_stable_tag     The current stable tag.
      * @param array  $svn_changed_tags       The list of SVN tags modified since last import.
      * @param string $svn_revision_triggered The SVN revision which triggered the rebuild.
@@ -333 +333 @@
         if ( $plugin->release_confirmation ) {
             foreach ( $versions_to_build as $i => $tag ) {
+                // Trunk should always be built, and will never be set as the stable tag when confirmations are enabled.
+                if ( 'trunk' === $tag ) {
+                    continue;
+                }
+
                 $release = Plugin_Directory::get_release( $plugin, $tag );