Skip to content

Commit 90c9ec1

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix JIT on nightly
2 parents c07aed5 + 734afa0 commit 90c9ec1

File tree

4 files changed

+2
-8
lines changed

4 files changed

+2
-8
lines changed

.github/actions/test-linux/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ runs:
3535
export TEST_PHP_JUNIT=junit.out.xml
3636
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
3737
-d opcache.jit=${{ inputs.jitType }} \
38+
-d opcache.jit_buffer_size=16M \
3839
-j$(/usr/bin/nproc) \
3940
-g FAIL,BORK,LEAK,XLEAK \
4041
--no-progress \

.github/actions/test-macos/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ runs:
2020
export TEST_PHP_JUNIT=junit.out.xml
2121
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
2222
-d opcache.jit=${{ inputs.jitType }} \
23+
-d opcache.jit_buffer_size=16M \
2324
-j$(sysctl -n hw.ncpu) \
2425
-g FAIL,BORK,LEAK,XLEAK \
2526
--no-progress \

.github/workflows/nightly.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ jobs:
9191
${{ matrix.run_tests_parameters }}
9292
-d zend_extension=opcache.so
9393
-d opcache.enable_cli=1
94-
-d opcache.jit_buffer_size=16M
9594
- name: Test OpCache
9695
uses: ./.github/actions/test-linux
9796
with:
@@ -112,7 +111,6 @@ jobs:
112111
${{ matrix.run_tests_parameters }}
113112
-d zend_extension=opcache.so
114113
-d opcache.enable_cli=1
115-
-d opcache.jit_buffer_size=16M
116114
- name: Verify generated files are up to date
117115
uses: ./.github/actions/verify-generated-files
118116
- name: Notify Slack
@@ -175,7 +173,6 @@ jobs:
175173
${{ matrix.run_tests_parameters }}
176174
-d zend_extension=opcache.so
177175
-d opcache.enable_cli=1
178-
-d opcache.jit_buffer_size=16M
179176
- name: Test OpCache
180177
uses: ./.github/actions/test-linux
181178
with:
@@ -191,7 +188,6 @@ jobs:
191188
${{ matrix.run_tests_parameters }}
192189
-d zend_extension=opcache.so
193190
-d opcache.enable_cli=1
194-
-d opcache.jit_buffer_size=16M
195191
- name: Notify Slack
196192
if: failure()
197193
uses: ./.github/actions/notify-slack
@@ -240,7 +236,6 @@ jobs:
240236
-d zend_extension=opcache.so
241237
-d opcache.enable_cli=1
242238
-d opcache.protect_memory=1
243-
-d opcache.jit_buffer_size=16M
244239
- name: Test OpCache
245240
uses: ./.github/actions/test-macos
246241
with:
@@ -258,7 +253,6 @@ jobs:
258253
-d zend_extension=opcache.so
259254
-d opcache.enable_cli=1
260255
-d opcache.protect_memory=1
261-
-d opcache.jit_buffer_size=16M
262256
- name: Verify generated files are up to date
263257
uses: ./.github/actions/verify-generated-files
264258
- name: Notify Slack

.github/workflows/push.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ jobs:
9595
runTestsParameters: >-
9696
-d zend_extension=opcache.so
9797
-d opcache.enable_cli=1
98-
-d opcache.jit_buffer_size=16M
9998
- name: Verify generated files are up to date
10099
uses: ./.github/actions/verify-generated-files
101100
MACOS_DEBUG_NTS:
@@ -129,7 +128,6 @@ jobs:
129128
-d zend_extension=opcache.so
130129
-d opcache.enable_cli=1
131130
-d opcache.protect_memory=1
132-
-d opcache.jit_buffer_size=16M
133131
- name: Verify generated files are up to date
134132
uses: ./.github/actions/verify-generated-files
135133
WINDOWS:

0 commit comments

Comments
 (0)