Remove WP 6.0 related code since it's deprecated now (#5978)

Automattic · Nov 8, 2024 · 7273adb · 7273adb
1 parent 56df329
commit 7273adb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,8 +28,6 @@ jobs:
       matrix:
         config:
         # PHP 8.1, Jetpack
-          - { wp: 6.0.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
-          - { wp: 6.0.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
           - { wp: 6.1.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
           - { wp: 6.1.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
           - { wp: 6.2.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
@@ -40,6 +38,8 @@ jobs:
           - { wp: 6.4.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
           - { wp: 6.5.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
           - { wp: 6.5.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.6.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.6.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
           - { wp: latest,  ms: 'no',  jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
           - { wp: latest,  ms: 'yes', jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
           - { wp: nightly, ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }

diff --git a/jetpack.php b/jetpack.php
@@ -19,10 +19,7 @@
 function vip_default_jetpack_version() {
 	global $wp_version;
 
-	if ( version_compare( $wp_version, '6.1', '<' ) ) {
-		// WordPress 6.0.x
-		return '12.0';
-	} elseif ( version_compare( $wp_version, '6.2', '<' ) ) {
+	if ( version_compare( $wp_version, '6.2', '<' ) ) {
 		// WordPress 6.1.x
 		return '12.5';
 	} elseif ( version_compare( $wp_version, '6.3', '<' ) ) {

diff --git a/tests/test-jetpack.php b/tests/test-jetpack.php
@@ -11,7 +11,6 @@ public function test__vip_default_jetpack_version() {
 
 		$versions_map = [
 			// WordPress version => Jetpack version
-			'6.0' => '12.0',
 			'6.1' => '12.5',
 			'6.2' => '12.8',
 			'6.3' => '13.1',