Skip to content

Commit 62440b5

Browse files
committed
Revert 6.9 Post Branching Tasks.
This is temporarily being reverted to re-branch 6.9 properly. Today is a day. Unprops davidbaumwald. git-svn-id: https://develop.svn.wordpress.org/trunk@61217 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 1c353b2 commit 62440b5

File tree

9 files changed

+7
-37
lines changed

9 files changed

+7
-37
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,12 @@ jobs:
4545
'test-build-processes.yml'
4646
]
4747
branch: [
48-
'6.9', '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0',
48+
'6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0',
4949
'5.9', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0',
5050
'4.9', '4.8', '4.7'
5151
]
5252
include:
5353
# PHP Compatibility testing was introduced in 5.5.
54-
- branch: '6.9'
55-
workflow: 'php-compatibility.yml'
5654
- branch: '6.8'
5755
workflow: 'php-compatibility.yml'
5856
- branch: '6.7'
@@ -85,8 +83,6 @@ jobs:
8583
# End-to-end testing was introduced in 5.3 but was later removed as there were no meaningful assertions.
8684
# Starting in 5.8 with #52905, some additional tests with real assertions were introduced.
8785
# Branches 5.8 and newer should be tested to confirm no regressions are introduced.
88-
- branch: '6.9'
89-
workflow: 'end-to-end-tests.yml'
9086
- branch: '6.8'
9187
workflow: 'end-to-end-tests.yml'
9288
- branch: '6.7'
@@ -113,8 +109,6 @@ jobs:
113109
# Performance testing was introduced in 6.2 using Puppeteer but was overhauled to use Playwright instead in 6.4.
114110
# Since the workflow frequently failed for 6.2 and 6.3 due to the flaky nature of the Puppeteer tests,
115111
# the workflow was removed from those two branches.
116-
- branch: '6.9'
117-
workflow: 'performance.yml'
118112
- branch: '6.8'
119113
workflow: 'performance.yml'
120114
- branch: '6.7'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
db-type: [ 'mysql' ]
6868
db-version: [ '5.7', '8.4' ]
6969
# WordPress 4.9 is the oldest version that supports PHP 7.2.
70-
wp: [ '4.9', '6.7', '6.8', '6.9-RC1' ]
70+
wp: [ '4.9', '6.6', '6.7', '6.8' ]
7171
multisite: [ false, true ]
7272

7373
exclude:

.version-support-mysql.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
11
{
2-
"7-0": [
3-
"9.4",
4-
"9.3",
5-
"9.2",
6-
"9.1",
7-
"9.0",
8-
"8.4",
9-
"8.0",
10-
"5.7",
11-
"5.6",
12-
"5.5"
13-
],
142
"6-9": [
153
"9.4",
164
"9.3",

.version-support-php.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
{
2-
"7-0": [
3-
"7.2",
4-
"7.3",
5-
"7.4",
6-
"8.0",
7-
"8.1",
8-
"8.2",
9-
"8.3",
10-
"8.4",
11-
"8.5"
12-
],
132
"6-9": [
143
"7.2",
154
"7.3",

SECURITY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Full details of the WordPress Security Policy and the list of covered projects a
1010

1111
| Version | Supported |
1212
|---------| --------- |
13-
| 6.9.x | Yes |
1413
| 6.8.x | Yes |
1514
| 6.7.x | Yes |
1615
| 6.6.x | Yes |

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wordpress/wordpress",
3-
"version": "7.0.0",
3+
"version": "6.9.0",
44
"license": "GPL-2.0-or-later",
55
"description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
66
"homepage": "https://wordpress.org",

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "WordPress",
3-
"version": "7.0.0",
3+
"version": "6.9.0",
44
"description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
55
"repository": {
66
"type": "svn",

src/wp-includes/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @global string $wp_version
1818
*/
19-
$wp_version = '7.0-alpha-61215-src';
19+
$wp_version = '6.9-RC1-61214-src';
2020

2121
/**
2222
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

0 commit comments

Comments
 (0)