Merge pull request #5061 from Automattic/develop

Staging release v20231128.1
Automattic · Nov 28, 2023 · 50c56a6 · 50c56a6
2 parents 9bb1580 + 708003d
commit 50c56a6
Show file tree

Hide file tree

Showing 23 changed files with 1,039 additions and 1,049 deletions.
diff --git a/.github/workflows/changelog-summary-prod.yml b/.github/workflows/changelog-summary-prod.yml
@@ -64,7 +64,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.27.1
+        uses: shivammathur/setup-php@2.28.0
         with:
           php-version: '7.4'
 

diff --git a/.github/workflows/changelog-summary-staging.yml b/.github/workflows/changelog-summary-staging.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.27.1
+        uses: shivammathur/setup-php@2.28.0
         with:
           php-version: '7.4'
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,45 +27,19 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        # Jetpack, Single-Site, PHP 7.4
-          - { wp: 5.9.x,   ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: 6.0.x,   ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: 6.1.x,   ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: latest,  ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: nightly, ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-        # Jetpack, Multi-Site, PHP 7.4
-          - { wp: latest,  ms: 'yes', jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: nightly, ms: 'yes', jp: 'yes', php: '7.4', phpunit: 7 }
-        # No Jetpack, WP latest, PHP 7.4
-          - { wp: latest,  ms: 'no',  jp: 'no',  php: '7.4', phpunit: 7 }
-          - { wp: latest,  ms: 'yes', jp: 'no',  php: '7.4', phpunit: 7 }
-        # PHP 8.0, Jetpack
-          - { wp: 6.0.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.0.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.1.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.1.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.2.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.2.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.3.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.3.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: latest,  ms: 'no',  jp: 'yes', php: '8.0', phpunit: '', coverage: 'yes' }
-          - { wp: latest,  ms: 'yes', jp: 'yes', php: '8.0', phpunit: '', coverage: 'yes' }
-          - { wp: nightly, ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: nightly, ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-        # No Jetpack, WP latest, PHP 8.0
-          - { wp: latest,  ms: 'no',  jp: 'no',  php: '8.0', phpunit: '' }
-          - { wp: latest,  ms: 'yes', jp: 'no',  php: '8.0', phpunit: '' }
         # PHP 8.1, Jetpack
-          - { wp: 6.0.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.0.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.1.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.1.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.2.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.2.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.3.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.3.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: latest,  ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
-          - { wp: latest,  ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.0.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.0.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.1.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.1.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.2.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.2.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.3.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.3.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: latest,  ms: 'no',  jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
+          - { wp: latest,  ms: 'yes', jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
+          - { wp: nightly, ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: nightly, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
         # No Jetpack, WP latest, PHP 8.1
           - { wp: latest,  ms: 'no',  jp: 'no',  php: '8.1', phpunit: '' }
           - { wp: latest,  ms: 'yes', jp: 'no',  php: '8.1', phpunit: '' }

diff --git a/.github/workflows/core-tests.yml b/.github/workflows/core-tests.yml
@@ -67,7 +67,7 @@ jobs:
           cache-dependency-path: 'wordpress/package-lock.json'
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.27.1
+        uses: shivammathur/setup-php@2.28.0
         with:
           php-version: 8.0
           coverage: none

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.27.1
+        uses: shivammathur/setup-php@2.28.0
         with:
           coverage: none
           php-version: "8.0"