From 3df70542df99280c480504529a0ccb6b3865e69c Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@users.noreply.github.com>
Date: Thu, 6 Jun 2024 09:57:16 -0400
Subject: [PATCH] Other updates.

---
 .github/workflows/coding-standards.yml     | 4 ++--
 .github/workflows/end-to-end-tests.yml     | 3 ++-
 .github/workflows/javascript-tests.yml     | 2 +-
 .github/workflows/php-compatibility.yml    | 2 +-
 .github/workflows/phpunit-tests.yml        | 2 +-
 .github/workflows/test-build-processes.yml | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 73ac673276639..7effa3838b8c3 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -48,7 +48,7 @@ jobs:
   # Runs PHP coding standards checks.
   phpcs:
     name: PHP coding standards
-    uses: WordPress/wordpress-develop/.github/workflows/callable-coding-standards-php.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -58,7 +58,7 @@ jobs:
   # Runs the JavaScript coding standards checks.
   jshint:
     name: JavaScript coding standards
-    uses: WordPress/wordpress-develop/.github/workflows/callable-coding-standards-javascript.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
index c7be44cc2dcea..7735b66eab05a 100644
--- a/.github/workflows/end-to-end-tests.yml
+++ b/.github/workflows/end-to-end-tests.yml
@@ -37,7 +37,7 @@ jobs:
   # Runs the end-to-end test suite.
   e2e-tests:
     name: Test with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
-    uses: WordPress/wordpress-develop/.github/workflows/callable-end-to-end-tests.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-end-to-end-tests.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -47,6 +47,7 @@ jobs:
         LOCAL_SCRIPT_DEBUG: [ true, false ]
     with:
       LOCAL_SCRIPT_DEBUG: ${{ matrix.LOCAL_SCRIPT_DEBUG }}
+      php-version: '8.0'
       install-gutenberg: false
 
   failed-workflow:
diff --git a/.github/workflows/javascript-tests.yml b/.github/workflows/javascript-tests.yml
index 332ad0372f3da..a881b8e6fa2be 100644
--- a/.github/workflows/javascript-tests.yml
+++ b/.github/workflows/javascript-tests.yml
@@ -46,7 +46,7 @@ jobs:
   # Runs the QUnit tests for WordPress.
   test-js:
     name: QUnit Tests
-    uses: WordPress/wordpress-develop/.github/workflows/callable-javascript-tests.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-javascript-tests.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
index 669d0df74bff4..0a501e05baa76 100644
--- a/.github/workflows/php-compatibility.yml
+++ b/.github/workflows/php-compatibility.yml
@@ -43,7 +43,7 @@ jobs:
   # Runs PHP compatibility testing.
   php-compatibility:
     name: Check PHP compatibility
-    uses: WordPress/wordpress-develop/.github/workflows/callable-php-compatibility.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-php-compatibility.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 3f9c275e1af8c..f9b2a35ff55d5 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -34,7 +34,7 @@ jobs:
   # Creates a PHPUnit test jobs.
   test-php:
     name: PHP ${{ matrix.php }} / ${{ matrix.multisite && ' Multisite' || 'Single site' }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
-    uses: WordPress/wordpress-develop/.github/workflows/callable-phpunit-tests.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests.yml@trunk
     permissions:
       contents: read
     secrets: inherit
diff --git a/.github/workflows/test-build-processes.yml b/.github/workflows/test-build-processes.yml
index a3e199532a3a2..227cf0873873e 100644
--- a/.github/workflows/test-build-processes.yml
+++ b/.github/workflows/test-build-processes.yml
@@ -41,7 +41,7 @@ jobs:
   # Tests the WordPress Core build process on multiple operating systems.
   test-core-build-process:
     name: Core running from ${{ matrix.directory }}
-    uses: WordPress/wordpress-develop/.github/workflows/callable-test-core-build-process.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -65,7 +65,7 @@ jobs:
   # See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability.
   test-core-build-process-macos:
     name: Core running from ${{ matrix.directory }}
-    uses: WordPress/wordpress-develop/.github/workflows/callable-test-core-build-process.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' }}