#63170 Upgrade test adjustments

.github/workflows/upgrade-testing.yml

@@ -37,15 +37,15 @@ permissions: {}
 # Because the number of jobs spawned can quickly balloon out of control, the following methodology is applied when
 # building out the matrix below:
 #
-# - The last two releases of WordPress are tested against all PHP/MySQL LTS version combinations and the most recent
-#   innovation release.
+# - The two most recent releases of WordPress are tested against all PHP/MySQL LTS version combinations and the
+#   most recent innovation release.
 # - The next 6 oldest versions of WordPress are tested against both the oldest and newest releases of PHP currently
 #   supported for both PHP 7 & 8 along with the oldest and newest MySQL LTS versions currently supported (no innovation
 #   releases). At the current 3 releases per year pace, this accounts for 2 additional years worth of releases.
 # - Of the remaining versions of WordPress still receiving security updates, only test the ones where the database
 #   version was updated since the previous major release.
 # - The oldest version of WordPress receiving security updates should always be tested against the same combinations as
-#   detailed for the last two releases.
+#   detailed for the two most recent releases.
 
 #  Notes about chosen MySQL versions:
 #    - Only the most recent innovation release should be included in testing.
@@ -54,8 +54,8 @@ permissions: {}
 #    - 5.6.x Docker containers are available and work, but 5.6 only accounts for ~2.3% of installs as of 12/6/2024.defaults:
 #    - 5.7.x accounts for ~20% of installs, so this is used below instead.
 jobs:
-  # Tests the full list of PHP/MySQL combinations for the last two versions of WordPress.
-  upgrade-tests-last-two-releases:
+  # Tests the full list of PHP/MySQL combinations for the two most recent versions of WordPress.
+  upgrade-tests-recent-releases:
     name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }}
     uses: ./.github/workflows/reusable-upgrade-testing.yml
     if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
@@ -89,7 +89,7 @@ jobs:
       new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }}
       multisite: ${{ matrix.multisite }}
 
-  # Tests the remaining 6.x releases on the oldest and newest supported versions of PHP 7 & 8.
+  # Tests 6.x releases where the WordPress database version changed on the oldest and newest supported versions of PHP 7 & 8.
   upgrade-tests-wp-6x-mysql:
     name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }}
     uses: ./.github/workflows/reusable-upgrade-testing.yml
@@ -101,7 +101,7 @@ jobs:
         php: [ '7.2', '7.4', '8.0', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.4' ]
-        wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6' ]
+        wp: [ '6.0', '6.3', '6.4', '6.5' ]
         multisite: [ false, true ]
 
         exclude:
@@ -273,7 +273,7 @@ jobs:
     permissions:
       actions: read
       contents: read
-    needs: [ upgrade-tests-last-two-releases, upgrade-tests-wp-6x-mysql, upgrade-tests-wp-5x-php-7x-mysql, upgrade-tests-wp-5x-php-8x-mysql, upgrade-tests-wp-4x-php-7x-mysql, upgrade-tests-wp-4x-php-8x-mysql, upgrade-tests-oldest-wp-mysql ]
+    needs: [ upgrade-tests-recent-releases, upgrade-tests-wp-6x-mysql, upgrade-tests-wp-5x-php-7x-mysql, upgrade-tests-wp-5x-php-8x-mysql, upgrade-tests-wp-4x-php-7x-mysql, upgrade-tests-wp-4x-php-8x-mysql, upgrade-tests-oldest-wp-mysql ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
       calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}