Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  [skip ci] Skip function JIT in nightly for ASAN

Author: iluuu1994

.github/nightly_matrix.php

@@ -52,7 +52,7 @@ function get_matrix_include(array $branches) {
             'zts' => true,
             'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
             'run_tests_parameters' => '--asan',
-            'timeout_minutes' => 480,
+            'test_function_jit' => false,
         ];
         if ($branch['ref'] !== 'PHP-8.0') {
             $jobs[] = [
@@ -62,6 +62,7 @@ function get_matrix_include(array $branches) {
                 'zts' => false,
                 'run_tests_parameters' => '--repeat 2',
                 'timeout_minutes' => 360,
+                'test_function_jit' => true,
             ];
             $jobs[] = [
                 'name' => '_VARIATION',
@@ -70,6 +71,7 @@ function get_matrix_include(array $branches) {
                 'zts' => true,
                 'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
                 'timeout_minutes' => 360,
+                'test_function_jit' => true,
             ];
         }
     }

.github/workflows/nightly.yml

@@ -41,12 +41,11 @@ jobs:
         debug: [true, false]
         name: ['']
         run_tests_parameters: ['']
-        timeout_minutes: [360]
+        test_function_jit: [true]
         zts: [true, false]
         include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
     name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-20.04
-    timeout-minutes: ${{ matrix.timeout_minutes }}
     steps:
       - name: git checkout
         uses: actions/checkout@v3
@@ -95,6 +94,9 @@ jobs:
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
       - name: Test Function JIT
+        # ASAN frequently timeouts. Each test run takes ~90 minutes, we can
+        # avoid running into the 6 hour timeout by skipping the function JIT.
+        if: matrix.test_function_jit
         uses: ./.github/actions/test-linux
         with:
           testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT