Merge branch 'main' into try/react-compiler

GoogleForCreators · Nov 24, 2024 · 683e8bb · 683e8bb
2 parents 17a5dcf + 451beaa
commit 683e8bb
Show file tree

Hide file tree

Showing 14 changed files with 251 additions and 214 deletions.
diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml
@@ -132,7 +132,7 @@ jobs:
       matrix:
         # TODO: add back Firefox once support is more mature.
         browser: ['chrome']
-        wp: ['6.4']
+        wp: ['6.5']
         snapshots: [false]
         experimental: [false]
         # We want to split up the tests into 2 parts running in parallel.
@@ -146,16 +146,6 @@ jobs:
             wp: 'latest'
             snapshots: true
             shard: '2/2'
-          - browser: 'chrome'
-            wp: '6.7-RC3'
-            snapshots: false
-            shard: '1/2'
-            experimental: true
-          - browser: 'chrome'
-            wp: '6.7-RC3'
-            snapshots: false
-            shard: '2/2'
-            experimental: true
 
     steps:
       - name: Harden Runner

diff --git a/.github/workflows/tests-unit-php.yml b/.github/workflows/tests-unit-php.yml
@@ -55,23 +55,23 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        php: ['8.2', '8.1', '8.0']
+        php: ['8.3', '8.2', '8.1', '8.0']
         wp: ['latest']
         coverage: [false]
         experimental: [false]
         include:
-          - php: '8.3'
+          - php: '8.4'
             wp: 'latest'
             coverage: true
             experimental: false
 
-          - php: '8.3'
+          - php: '8.4'
             wp: 'latest'
             random: true
             experimental: true
 
           - php: '7.4'
-            wp: '6.4'
+            wp: '6.5'
             experimental: false
 
           - php: '8.4'

diff --git a/bin/local-env/docker-compose.yml b/bin/local-env/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   wordpress:
-    image: wordpress:php${PHP_VERSION:-7.4}
+    image: wordpress:php${PHP_VERSION:-8.2}
     ports:
       - '127.0.0.1:8899:80'
     environment:
@@ -25,8 +25,7 @@ services:
       - mysql
 
   cli:
-    image: wordpress:cli-php${PHP_VERSION:-7.4}
-    user: xfs
+    image: wordpress:cli-php${PHP_VERSION:-8.2}
     environment:
       WORDPRESS_DB_HOST: mysql
       WORDPRESS_DB_USER: root

diff --git a/bin/local-env/includes.sh b/bin/local-env/includes.sh
@@ -161,7 +161,7 @@ dc() {
 # Executes a WP CLI request in the CLI container.
 ##
 wp() {
-	dc exec -T -u xfs $CLI wp "$@"
+	dc exec -T -u 33:33 $CLI wp "$@"
 }
 
 ##
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,7 +161,7 @@ dc() { @@
     # Executes a WP CLI request in the CLI container.
     ##
     wp() {
-    	dc exec -T -u xfs $CLI wp "$@"
+    	dc exec -T -u 33:33 $CLI wp "$@"
     }
     ##
@@ Expand Down @@