Merge branch 'trunk' into add-xdebug-support-to-php-wasm-node-asyncify

Author: mho22

.github/workflows/ci.yml

@@ -30,38 +30,22 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - name: test-unit-asyncify (1/16)
+                    - name: test-unit-asyncify (1/8)
                       target: test
-                    - name: test-unit-asyncify (2/16)
-                      target: test-php
-                    - name: test-unit-asyncify (3/16)
-                      target: test-php-networking
-                    - name: test-unit-asyncify (4/16)
-                      target: test-php-request-handler-files
-                    - name: test-unit-asyncify (5/16)
-                      target: test-php-request-handler-requests
-                    - name: test-unit-asyncify (6/16)
-                      target: test-php-asyncify-file-get-contents-http
-                    - name: test-unit-asyncify (7/16)
-                      target: test-php-asyncify-file-get-contents-https
-                    - name: test-unit-asyncify (8/16)
-                      target: test-php-asyncify-fopen-http
-                    - name: test-unit-asyncify (9/16)
-                      target: test-php-asyncify-fopen-https
-                    - name: test-unit-asyncify (10/16)
-                      target: test-php-asyncify-fsockopen-http
-                    - name: test-unit-asyncify (11/16)
-                      target: test-php-asyncify-fsockopen-https
-                    - name: test-unit-asyncify (12/16)
-                      target: test-php-asyncify-gethostbyname-http
-                    - name: test-unit-asyncify (13/16)
-                      target: test-php-asyncify-gethostbyname-https
-                    - name: test-unit-asyncify (14/16)
-                      target: test-php-asyncify-mysqli-http
-                    - name: test-unit-asyncify (15/16)
-                      target: test-php-asyncify-mysqli-https
-                    - name: test-unit-asyncify (16/16)
-                      target: test-php-asyncify-sqlite3
+                    - name: test-unit-asyncify (2/8)
+                      target: test-asyncify
+                    - name: test-unit-asyncify (3/8)
+                      target: test-php-file-get-contents-asyncify
+                    - name: test-unit-asyncify (4/8)
+                      target: test-php-fopen-asyncify
+                    - name: test-unit-asyncify (5/8)
+                      target: test-php-fsockopen-asyncify
+                    - name: test-unit-asyncify (6/8)
+                      target: test-php-gethostbyname-asyncify
+                    - name: test-unit-asyncify (7/8)
+                      target: test-php-mysqli-asyncify
+                    - name: test-unit-asyncify (8/8)
+                      target: test-php-sqlite3-asyncify
         name: ${{ matrix.name }}
         services:
             mysql:
@@ -97,9 +81,36 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - name: test-unit-jspi (1/1)
-                      target: test-php-dynamic-loading-jspi
+                    - name: test-unit-jspi (1/7)
+                      target: test-jspi
+                    - name: test-unit-jspi (2/7)
+                      target: test-php-file-get-contents-jspi
+                    - name: test-unit-jspi (3/7)
+                      target: test-php-fopen-jspi
+                    - name: test-unit-jspi (4/7)
+                      target: test-php-fsockopen-jspi
+                    - name: test-unit-jspi (5/7)
+                      target: test-php-gethostbyname-jspi
+                    - name: test-unit-jspi (6/7)
+                      target: test-php-mysqli-jspi
+                    - name: test-unit-jspi (7/7)
+                      target: test-php-sqlite3-jspi
         name: ${{ matrix.name }}
+        services:
+            mysql:
+                image: mysql:5.7
+                env:
+                    MYSQL_DATABASE: test_db
+                    MYSQL_USER: user
+                    MYSQL_PASSWORD: password
+                    MYSQL_ROOT_PASSWORD: rootpassword
+                ports:
+                    - 3306:3306
+                options: >-
+                    --health-cmd="mysqladmin ping --silent"
+                    --health-interval=10s
+                    --health-timeout=5s
+                    --health-retries=3
         steps:
             - uses: actions/checkout@v4
               with:
@@ -108,21 +119,10 @@ jobs:
               with:
                   node-version: 23
             - run: node --expose-gc node_modules/nx/bin/nx affected --target=${{ matrix.target }}
-    # Most of these tests pass locally but the process is crashing
-    # on the CI runner.
-    #
-    # test-unit-jspi:
-    #     runs-on: ubuntu-latest
-    #     needs: [lint-and-typecheck]
-    #     steps:
-    #         - uses: actions/checkout@v4
-    #           with:
-    #               submodules: true
-    #         - uses: ./.github/actions/prepare-playground
-    #           with:
-    #               # @TODO: Switch to the production version once it's released
-    #               node-version: 23.0.0-nightly2024100909d10b50dc
-    #         - run: node --experimental-wasm-jspi --experimental-wasm-stack-switching --expose-gc node_modules/nx/bin/nx affected --target=test --configuration=ci
+              env:
+                  MYSQL_DATABASE: test_db
+                  MYSQL_USER: user
+                  MYSQL_PASSWORD: password
     test-e2e:
         runs-on: ubuntu-latest
         needs: [lint-and-typecheck]

lerna.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "node_modules/lerna/schemas/lerna-schema.json",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"useWorkspaces": true,
 	"useNx": true
 }