Changeset 56440

Timestamp:

08/24/2023 01:28:26 PM (13 months ago)

Author:

desrosj

Message:

Build/Test Tools: Merge pre-commit changes missed in [56439].

Props l1nuxjedi.
See #30462.

Location:

trunk/.github/workflows

Files:

• phpunit-tests-run.yml (modified) (3 diffs)
• phpunit-tests.yml (modified) (9 diffs)

trunk/.github/workflows/phpunit-tests-run.yml

@@ -25 +25 @@
         required: false
         type: 'string'
-        default: '5.7'
+        default: '8.0'
       multisite:
         description: 'Whether to run tests as multisite'
@@ -42 +42 @@
         default: 'phpunit.xml.dist'
       report:
-        description: 'Whether to report results to WordPress.org hosting tests'
+        description: 'Whether to report results to WordPress.org Hosting Tests'
         required: false
         type: 'boolean'
@@ -52 +52 @@
   LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }}
   PHPUNIT_CONFIG: ${{ inputs.phpunit-config }}
+  PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
 
 jobs:

trunk/.github/workflows/phpunit-tests.yml

@@ -31 +31 @@
 permissions: {}
 
-env:
-  PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
-  LOCAL_PHP_MEMCACHED: ${{ false }}
-
 jobs:
   #
@@ -41 +37 @@
   test-with-mysql:
     name: PHP ${{ matrix.php }}
-    uses: desrosj/wordpress-develop/.github/workflows/phpunit-tests-run.yml@expanded-db-testing-callable-workflow
+    uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
     permissions:
       contents: read
@@ -69 +65 @@
             multisite: true
             memcached: true
-          # Report the results of the PHP 7.4 without memcached job.
+          # Report test results to the Host Test Results.
           - os: ubuntu-latest
             php: '7.4'
@@ -92 +88 @@
   test-with-mariadb:
     name: PHP ${{ matrix.php }}
-    uses: desrosj/wordpress-develop/.github/workflows/phpunit-tests-run.yml@expanded-db-testing-callable-workflow
+    uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
     permissions:
       contents: read
@@ -105 +101 @@
         multisite: [ false, true ]
         memcached: [ false ]
-        report: [ false ]
 
         include:
@@ -115 +110 @@
           multisite: false
           memcached: true
-          report: false
         - os: ubuntu-latest
           php: '7.4'
@@ -122 +116 @@
           multisite: true
           memcached: true
-          report: false
     with:
       os: ${{ matrix.os }}
@@ -131 +124 @@
       memcached: ${{ matrix.memcached }}
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
-      report: ${{ matrix.report }}
+      report: ${{ matrix.report || false }}
 
   slack-notifications:
@@ -161 +154 @@
       github.run_attempt < 2 &&
       (
-        needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure'
+        needs.test-with-mysql.result == 'cancelled' || needs.test-with-mysql.result == 'failure' ||
+        needs.test-with-mariadb.result == 'cancelled' || needs.test-with-mariadb.result == 'failure'
       )