Changeset 58097 for trunk/.github/workflows

Timestamp:

05/04/2024 07:23:31 PM (23 months ago)

Author:

johnbillion

Message:

Bootstrap/Load: Add support for custom ports in multisite site addresses.

This allows a Multisite network to use an address that includes a port name, such as example.com:1234, and adds support for this to the local development environment too. You can now run a Multisite installation on the local development environment, for example at localhost:8889.

This also fixes some bugs with running a single site installation on a port, and updates the testing infrastructure so that the whole test suite runs both with and without a port number.

Props djzone, scribu, nacin, ipstenu, F J Kaiser, jeremyfelt, johnjamesjacoby, spacedmonkey, PerS, Clorith, Blackbam, enrico.sorcinelli, Jules Colle, obliviousharmony, desrosj, johnbillion

Fixes #21077, #52088

Location:

trunk/.github/workflows

Files:

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

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

@@ -41 +41 @@
         type: 'string'
         default: 'phpunit.xml.dist'
+      tests-domain:
+        description: 'The domain to use for the tests'
+        required: false
+        type: 'string'
+        default: 'example.org'
       report:
         description: 'Whether to report results to WordPress.org Hosting Tests'
@@ -51 +56 @@
   LOCAL_DB_VERSION: ${{ inputs.db-version }}
   LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }}
+  LOCAL_WP_TESTS_DOMAIN: ${{ inputs.tests-domain }}
   PHPUNIT_CONFIG: ${{ inputs.phpunit-config }}
   PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
@@ -75 +81 @@
   # - Submit the test results to the WordPress.org host test results.
   phpunit-tests:
-    name: PHP ${{ inputs.php }} / ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }}
+    name: PHP ${{ inputs.php }} / ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
     runs-on: ${{ inputs.os }}
     timeout-minutes: 20

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

@@ -49 +49 @@
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0', '8.1', '8.2', '8.3' ]
+        tests-domain: [ 'example.org' ]
         multisite: [ false, true ]
         memcached: [ false ]
@@ -58 +59 @@
             db-type: 'mysql'
             db-version: '5.7'
+            tests-domain: 'example.org'
             multisite: false
             memcached: true
@@ -64 +66 @@
             db-type: 'mysql'
             db-version: '5.7'
+            tests-domain: 'example.org'
             multisite: true
             memcached: true
+          # Include jobs with a port on the test domain for both single and multisite.
+          - os: ubuntu-latest
+            php: '7.4'
+            db-type: 'mysql'
+            db-version: '5.7'
+            tests-domain: 'example.org:8889'
+            multisite: false
+            memcached: false
+          - os: ubuntu-latest
+            php: '7.4'
+            db-type: 'mysql'
+            db-version: '5.7'
+            tests-domain: 'example.org:8889'
+            multisite: true
+            memcached: false
           # Report test results to the Host Test Results.
           - os: ubuntu-latest
@@ -71 +89 @@
             db-type: 'mysql'
             db-version: '5.7'
+            tests-domain: 'example.org'
             multisite: false
             memcached: false
@@ -82 +101 @@
       memcached: ${{ matrix.memcached }}
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
+      tests-domain: ${{ matrix.tests-domain }}
       report: ${{ matrix.report || false }}