clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Fix JIT on nightly
This commit is contained in:
Ilija Tovilo 2023-10-13 11:42:55 +02:00
commit 90c9ec14eb
No known key found for this signature in database
GPG Key ID: A4F5D403F118200A
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/test-linux/action.yml vendored
View File

@ -35,6 +35,7 @@ runs:
export TEST_PHP_JUNIT=junit.out.xml export TEST_PHP_JUNIT=junit.out.xml
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
-d opcache.jit=${{ inputs.jitType }} \ -d opcache.jit=${{ inputs.jitType }} \
-d opcache.jit_buffer_size=16M \
-j$(/usr/bin/nproc) \ -j$(/usr/bin/nproc) \
-g FAIL,BORK,LEAK,XLEAK \ -g FAIL,BORK,LEAK,XLEAK \
--no-progress \ --no-progress \

1
.github/actions/test-macos/action.yml vendored
View File

@ -20,6 +20,7 @@ runs:
export TEST_PHP_JUNIT=junit.out.xml export TEST_PHP_JUNIT=junit.out.xml
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
-d opcache.jit=${{ inputs.jitType }} \ -d opcache.jit=${{ inputs.jitType }} \
-d opcache.jit_buffer_size=16M \
-j$(sysctl -n hw.ncpu) \ -j$(sysctl -n hw.ncpu) \
-g FAIL,BORK,LEAK,XLEAK \ -g FAIL,BORK,LEAK,XLEAK \
--no-progress \ --no-progress \

6
.github/workflows/nightly.yml vendored
View File

@ -91,7 +91,6 @@ jobs:
${{ matrix.run_tests_parameters }} ${{ matrix.run_tests_parameters }}
-d zend_extension=opcache.so -d zend_extension=opcache.so
-d opcache.enable_cli=1 -d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
- name: Test OpCache - name: Test OpCache
uses: ./.github/actions/test-linux uses: ./.github/actions/test-linux
with: with:
@ -112,7 +111,6 @@ jobs:
${{ matrix.run_tests_parameters }} ${{ matrix.run_tests_parameters }}
-d zend_extension=opcache.so -d zend_extension=opcache.so
-d opcache.enable_cli=1 -d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
- name: Verify generated files are up to date - name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files uses: ./.github/actions/verify-generated-files
- name: Notify Slack - name: Notify Slack
@ -175,7 +173,6 @@ jobs:
${{ matrix.run_tests_parameters }} ${{ matrix.run_tests_parameters }}
-d zend_extension=opcache.so -d zend_extension=opcache.so
-d opcache.enable_cli=1 -d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
- name: Test OpCache - name: Test OpCache
uses: ./.github/actions/test-linux uses: ./.github/actions/test-linux
with: with:
@ -191,7 +188,6 @@ jobs:
${{ matrix.run_tests_parameters }} ${{ matrix.run_tests_parameters }}
-d zend_extension=opcache.so -d zend_extension=opcache.so
-d opcache.enable_cli=1 -d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
- name: Notify Slack - name: Notify Slack
if: failure() if: failure()
uses: ./.github/actions/notify-slack uses: ./.github/actions/notify-slack
@ -240,7 +236,6 @@ jobs:
-d zend_extension=opcache.so -d zend_extension=opcache.so
-d opcache.enable_cli=1 -d opcache.enable_cli=1
-d opcache.protect_memory=1 -d opcache.protect_memory=1
-d opcache.jit_buffer_size=16M
- name: Test OpCache - name: Test OpCache
uses: ./.github/actions/test-macos uses: ./.github/actions/test-macos
with: with:
@ -258,7 +253,6 @@ jobs:
-d zend_extension=opcache.so -d zend_extension=opcache.so
-d opcache.enable_cli=1 -d opcache.enable_cli=1
-d opcache.protect_memory=1 -d opcache.protect_memory=1
-d opcache.jit_buffer_size=16M
- name: Verify generated files are up to date - name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files uses: ./.github/actions/verify-generated-files
- name: Notify Slack - name: Notify Slack

2
.github/workflows/push.yml vendored
View File

@ -95,7 +95,6 @@ jobs:
runTestsParameters: >- runTestsParameters: >-
-d zend_extension=opcache.so -d zend_extension=opcache.so
-d opcache.enable_cli=1 -d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
- name: Verify generated files are up to date - name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files uses: ./.github/actions/verify-generated-files
MACOS_DEBUG_NTS: MACOS_DEBUG_NTS:
@ -129,7 +128,6 @@ jobs:
-d zend_extension=opcache.so -d zend_extension=opcache.so
-d opcache.enable_cli=1 -d opcache.enable_cli=1
-d opcache.protect_memory=1 -d opcache.protect_memory=1
-d opcache.jit_buffer_size=16M
- name: Verify generated files are up to date - name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files uses: ./.github/actions/verify-generated-files
WINDOWS: WINDOWS: