Changeset 61287

Timestamp:

11/24/2025 05:55:31 PM (4 weeks ago)

Author:

desrosj

Message:

General: Final 6.9 post-branching tasks.

This makes the following changes to the 6.9 branch:

• Pin PHP 8.5 and MySQL 8.4 as the default valuses of LOCAL_PHP and LOCAL_DB_VERSION.
• Removes unnecessary GitHub Actions workflow files.
• Changes all local GitHub Actions references to remote ones targeting trunk.

Reviewed by peterwilsoncc.

Props peterwilsoncc, johnbillion, davidbaumwald.
Fixes #64235.

Location:

branches/6.9

Files:

• .env.example (modified) (1 diff)
• .github/workflows/check-built-files.yml (modified) (1 diff)
• .github/workflows/cleanup-pull-requests.yml (modified) (1 diff)
• .github/workflows/coding-standards.yml (modified) (3 diffs)
• .github/workflows/commit-built-file-changes.yml (deleted)
• .github/workflows/end-to-end-tests.yml (modified) (2 diffs)
• .github/workflows/failed-workflow.yml (deleted)
• .github/workflows/install-testing.yml (deleted)
• .github/workflows/javascript-tests.yml (modified) (2 diffs)
• .github/workflows/local-docker-environment.yml (modified) (3 diffs)
• .github/workflows/performance.yml (modified) (3 diffs)
• .github/workflows/php-compatibility.yml (modified) (2 diffs)
• .github/workflows/phpunit-tests.yml (modified) (6 diffs)
• .github/workflows/reusable-build-package.yml (deleted)
• .github/workflows/reusable-check-built-files.yml (deleted)
• .github/workflows/reusable-cleanup-pull-requests.yml (deleted)
• .github/workflows/reusable-coding-standards-javascript.yml (deleted)
• .github/workflows/reusable-coding-standards-php.yml (deleted)
• .github/workflows/reusable-end-to-end-tests.yml (deleted)
• .github/workflows/reusable-javascript-tests.yml (deleted)
• .github/workflows/reusable-performance-report-v2.yml (deleted)
• .github/workflows/reusable-performance-test-v2.yml (deleted)
• .github/workflows/reusable-performance.yml (deleted)
• .github/workflows/reusable-php-compatibility.yml (deleted)
• .github/workflows/reusable-phpunit-tests-v1.yml (deleted)
• .github/workflows/reusable-phpunit-tests-v2.yml (deleted)
• .github/workflows/reusable-phpunit-tests-v3.yml (deleted)
• .github/workflows/reusable-support-json-reader-v1.yml (deleted)
• .github/workflows/reusable-test-core-build-process.yml (deleted)
• .github/workflows/reusable-test-gutenberg-build-process.yml (deleted)
• .github/workflows/reusable-test-local-docker-environment-v1.yml (deleted)
• .github/workflows/reusable-upgrade-testing.yml (deleted)
• .github/workflows/reusable-workflow-lint.yml (deleted)
• .github/workflows/slack-notifications.yml (deleted)
• .github/workflows/test-and-zip-default-themes.yml (deleted)
• .github/workflows/test-build-processes.yml (modified) (5 diffs)
• .github/workflows/test-coverage.yml (deleted)
• .github/workflows/test-old-branches.yml (deleted)
• .github/workflows/upgrade-develop-testing.yml (modified) (4 diffs)
• .github/workflows/upgrade-testing.yml (deleted)
• .github/workflows/workflow-lint.yml (modified) (2 diffs)
• docker-compose.yml (modified) (3 diffs)

branches/6.9/.env.example

@@ -16 +16 @@
 
 # The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
-LOCAL_PHP=latest
+LOCAL_PHP=8.5-fpm
 
 # Whether or not to enable Xdebug.

branches/6.9/.github/workflows/check-built-files.yml

@@ -47 +47 @@
     name: Check built files
     if: ${{ github.repository == 'wordpress/wordpress-develop' }}
-    uses: ./.github/workflows/reusable-check-built-files.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-check-built-files.yml@trunk
     permissions:
       contents: read

branches/6.9/.github/workflows/cleanup-pull-requests.yml

@@ -26 +26 @@
       pull-requests: write
     if: ${{ github.repository == 'WordPress/wordpress-develop' }}
-    uses: ./.github/workflows/reusable-cleanup-pull-requests.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-cleanup-pull-requests.yml@trunk

branches/6.9/.github/workflows/coding-standards.yml

@@ -53 +53 @@
   phpcs:
     name: Coding standards
-    uses: ./.github/workflows/reusable-coding-standards-php.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
     permissions:
       contents: read
@@ -61 +61 @@
   jshint:
     name: Coding standards
-    uses: ./.github/workflows/reusable-coding-standards-javascript.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
     permissions:
       contents: read
@@ -68 +68 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/.github/workflows/end-to-end-tests.yml

@@ -58 +58 @@
   e2e-tests:
     name: ${{ matrix.label }}
-    uses: ./.github/workflows/reusable-end-to-end-tests.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-end-to-end-tests.yml@trunk
     permissions:
       contents: read
@@ -73 +73 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/.github/workflows/javascript-tests.yml

@@ -54 +54 @@
   test-js:
     name: QUnit Tests
-    uses: ./.github/workflows/reusable-javascript-tests.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-javascript-tests.yml@trunk
     permissions:
       contents: read
@@ -61 +61 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/.github/workflows/local-docker-environment.yml

@@ -75 +75 @@
   build-test-matrix:
     name: Build Test Matrix
-    uses: ./.github/workflows/reusable-support-json-reader-v1.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-support-json-reader-v1.yml@trunk
     permissions:
       contents: read
@@ -86 +86 @@
   environment-tests-mysql:
     name: PHP ${{ matrix.php }}
-    uses: ./.github/workflows/reusable-test-local-docker-environment-v1.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-local-docker-environment-v1.yml@trunk
     permissions:
       contents: read
@@ -124 +124 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/.github/workflows/performance.yml

@@ -96 +96 @@
   performance:
     name: ${{ matrix.multisite && 'Multisite' || 'Single Site' }} ${{ matrix.memcached && 'Memcached' || 'Default' }}
-    uses: ./.github/workflows/reusable-performance-test-v2.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-performance-test-v2.yml@trunk
     needs: [ determine-matrix ]
     permissions:
@@ -114 +114 @@
   compare:
     name: ${{ matrix.label }}
-    uses: ./.github/workflows/reusable-performance-report-v2.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-performance-report-v2.yml@trunk
     needs: [ determine-matrix, performance ]
     permissions:
@@ -135 +135 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/.github/workflows/php-compatibility.yml

@@ -45 +45 @@
   php-compatibility:
     name: Check PHP compatibility
-    uses: ./.github/workflows/reusable-php-compatibility.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-php-compatibility.yml@trunk
     permissions:
       contents: read
@@ -52 +52 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/.github/workflows/phpunit-tests.yml

@@ -64 +64 @@
   test-with-mysql:
     name: PHP ${{ matrix.php }}
-    uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
     permissions:
       contents: read
@@ -141 +141 @@
   test-with-mariadb:
     name: PHP ${{ matrix.php }}
-    uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
     permissions:
       contents: read
@@ -193 +193 @@
   test-innovation-releases:
     name: PHP ${{ matrix.php }}
-    uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
     permissions:
       contents: read
@@ -241 +241 @@
   html-api-test-groups:
     name: ${{ matrix.label }}
-    uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
     permissions:
       contents: read
@@ -270 +270 @@
   limited-matrix-for-forks:
     name: PHP ${{ matrix.php }}
-    uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
     permissions:
       contents: read
@@ -321 +321 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/.github/workflows/test-build-processes.yml

@@ -51 +51 @@
   test-core-build-process:
     name: Core running from ${{ matrix.directory }}
-    uses: ./.github/workflows/reusable-test-core-build-process.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
     permissions:
       contents: read
@@ -86 +86 @@
   test-core-build-process-additional-os:
     name: Core running from ${{ matrix.directory }}
-    uses: ./.github/workflows/reusable-test-core-build-process.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
     permissions:
       contents: read
@@ -102 +102 @@
   test-gutenberg-build-process:
     name: Gutenberg running from ${{ matrix.directory }}
-    uses: ./.github/workflows/reusable-test-gutenberg-build-process.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-gutenberg-build-process.yml@trunk
     permissions:
       contents: read
@@ -127 +127 @@
   test-gutenberg-build-process-additional-os:
     name: Gutenberg running from ${{ matrix.directory }}
-    uses: ./.github/workflows/reusable-test-gutenberg-build-process.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-gutenberg-build-process.yml@trunk
     permissions:
       contents: read
@@ -142 +142 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

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

@@ -47 +47 @@
   build:
     name: Build
-    uses: ./.github/workflows/reusable-build-package.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-build-package.yml@trunk
     if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
     permissions:
@@ -55 +55 @@
   upgrade-tests-develop:
     name: Upgrade from ${{ matrix.wp }}
-    uses: ./.github/workflows/reusable-upgrade-testing.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-upgrade-testing.yml@trunk
     if: ${{ github.repository == 'WordPress/wordpress-develop' }}
     needs: [ build ]
@@ -90 +90 @@
   upgrade-tests-develop-forks:
     name: Upgrade from ${{ matrix.wp }}
-    uses: ./.github/workflows/reusable-upgrade-testing.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-upgrade-testing.yml@trunk
     if: ${{ github.repository != 'WordPress/wordpress-develop' }}
     needs: [ build ]
@@ -121 +121 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/.github/workflows/workflow-lint.yml

@@ -33 +33 @@
   lint:
     name: Lint GitHub Action files
-    uses: ./.github/workflows/reusable-workflow-lint.yml
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-workflow-lint.yml@trunk
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
     permissions:
@@ -42 +42 @@
   slack-notifications:
     name: Slack Notifications
-    uses: ./.github/workflows/slack-notifications.yml
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read

branches/6.9/docker-compose.yml

@@ -33 +33 @@
   ##
   php:
-    image: wordpressdevelop/php:${LOCAL_PHP-latest}
+    image: wordpressdevelop/php:${LOCAL_PHP-8.5-fpm}
 
     networks:
@@ -65 +65 @@
   ##
   mysql:
-    image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}
+    image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-8.4}
 
     networks:
@@ -96 +96 @@
   ##
   cli:
-    image: wordpressdevelop/cli:${LOCAL_PHP-latest}
+    image: wordpressdevelop/cli:${LOCAL_PHP-8.5-fpm}
 
     networks: