Merge branch 'trunk' into failed-workflow-trigger

Author: johnbillion

.github/workflows/test-old-branches.yml

@@ -25,7 +25,7 @@ on:
 permissions: {}
 
 env:
-  CURRENTLY_SUPPORTED_BRANCH: '6.9'
+  CURRENTLY_SUPPORTED_BRANCH: '7.0'
 
 jobs:
   dispatch-workflows-for-old-branches:
@@ -45,12 +45,15 @@ jobs:
             'test-build-processes.yml'
         ]
         branch: [
+            '7.0',
             '6.9', '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0',
             '5.9', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0',
             '4.9', '4.8', '4.7'
         ]
         include:
           # PHP Compatibility testing was introduced in 5.5.
+          - branch: '7.0'
+            workflow: 'php-compatibility.yml'
           - branch: '6.9'
             workflow: 'php-compatibility.yml'
           - branch: '6.8'
@@ -85,6 +88,8 @@ jobs:
           # End-to-end testing was introduced in 5.3 but was later removed as there were no meaningful assertions.
           # Starting in 5.8 with #52905, some additional tests with real assertions were introduced.
           # Branches 5.8 and newer should be tested to confirm no regressions are introduced.
+          - branch: '7.0'
+            workflow: 'end-to-end-tests.yml'
           - branch: '6.9'
             workflow: 'end-to-end-tests.yml'
           - branch: '6.8'
@@ -113,9 +118,9 @@ jobs:
           # Performance testing was introduced in 6.2 using Puppeteer but was overhauled to use Playwright instead in 6.4.
           # Since the workflow frequently failed for 6.2 and 6.3 due to the flaky nature of the Puppeteer tests,
           # the workflow was removed from those two branches.
-          - branch: '6.9'
+          - branch: '7.0'
             workflow: 'performance.yml'
-          - branch: '6.8'
+          - branch: '6.9'
             workflow: 'performance.yml'
 
     # Run all branches monthly, but only the currently supported one twice per month.

.github/workflows/upgrade-develop-testing.yml

@@ -75,7 +75,7 @@ jobs:
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.4' ]
         # WordPress 5.3 is the oldest version that supports PHP 7.4.
-        wp: [ '5.3', '6.8', '6.9' ]
+        wp: [ '5.3', '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}
@@ -101,7 +101,7 @@ jobs:
         php: [ '7.4', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '8.4' ]
-        wp: [ '6.8', '6.9' ]
+        wp: [ '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}

.github/workflows/upgrade-testing.yml

@@ -71,7 +71,7 @@ jobs:
         php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0', '8.4', '9.6' ]
-        wp: [ '6.8', '6.9' ]
+        wp: [ '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}

.gitignore

@@ -33,15 +33,16 @@ wp-tests-config.php
 /src/wp-admin/css/colors/*/*.css
 /src/wp-admin/js
 /src/wp-includes/assets/*
+!/src/wp-includes/assets/icon-library-manifest.php
+!/src/wp-includes/assets/script-loader-packages.php
+!/src/wp-includes/assets/script-modules-packages.php
 /src/wp-includes/js
 /src/wp-includes/css/dist
 /src/wp-includes/css/*.min.css
 /src/wp-includes/css/*-rtl.css
-/src/wp-includes/blocks/*
-!/src/wp-includes/blocks/index.php
-/src/wp-includes/images/icon-library
-/src/wp-includes/build
-/src/wp-includes/theme.json
+/src/wp-includes/blocks/**/*.css
+/src/wp-includes/blocks/**/*.js
+/src/wp-includes/blocks/**/*.js.map
 /packagehash.txt
 /.gutenberg-hash
 /artifacts

.version-support-mysql.json

@@ -1,4 +1,18 @@
 {
+	"7-1": [
+		"9.6",
+		"9.5",
+		"9.4",
+		"9.3",
+		"9.2",
+		"9.1",
+		"9.0",
+		"8.4",
+		"8.0",
+		"5.7",
+		"5.6",
+		"5.5"
+	],
 	"7-0": [
 		"9.6",
 		"9.5",

.version-support-php.json

@@ -1,4 +1,13 @@
 {
+	"7-1": [
+		"7.4",
+		"8.0",
+		"8.1",
+		"8.2",
+		"8.3",
+		"8.4",
+		"8.5"
+	],
 	"7-0": [
 		"7.4",
 		"8.0",

Gruntfile.js

@@ -47,15 +47,10 @@ module.exports = function(grunt) {
 			'wp-includes/js/',
 		],
 
-		// All files copied from the Gutenberg repository.
+		// All files copied from the Gutenberg repository excluded from version control.
 		gutenbergFiles = [
-			'wp-includes/assets',
-			'wp-includes/build',
 			'wp-includes/js/dist',
 			'wp-includes/css/dist',
-			'wp-includes/blocks/**/*',
-			'!wp-includes/blocks/index.php',
-			'wp-includes/images/icon-library',
 			// Old location kept temporarily to ensure they are cleaned up.
 			'wp-includes/icons',
 		],
@@ -2131,19 +2126,9 @@ module.exports = function(grunt) {
 	] );
 
 	grunt.registerTask( 'build', function() {
-		var done = this.async();
-
-		grunt.util.spawn( {
-			grunt: true,
-			args: [ 'clean', '--dev' ],
-			opts: { stdio: 'inherit' }
-		}, function( buildError ) {
-			done( ! buildError );
-		} );
-
 		if ( grunt.option( 'dev' ) ) {
 			grunt.task.run( [
-				'gutenberg:download',
+				'gutenberg:verify',
 				'build:js',
 				'build:css',
 				'build:codemirror',
@@ -2153,7 +2138,7 @@ module.exports = function(grunt) {
 			] );
 		} else {
 			grunt.task.run( [
-				'gutenberg:download',
+				'gutenberg:verify',
 				'build:certificates',
 				'build:files',
 				'build:js',

SECURITY.md

@@ -10,6 +10,7 @@ Full details of the WordPress Security Policy and the list of covered projects a
 
 | Version | Supported |
 |---------| --------- |
+| 7.0.x   | Yes       |
 | 6.9.x   | Yes       |
 | 6.8.x   | Yes       |
 | 6.7.x   | Yes       |

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "wordpress/wordpress",
-	"version": "7.0.0",
+	"version": "7.1.0",
 	"license": "GPL-2.0-or-later",
 	"description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
 	"homepage": "https://wordpress.org",