8000 Merge branch 'PHP-8.0' into PHP-8.1 · php/php-src@d1dc710 · GitHub
[go: up one dir, main page]
Skip to content

Commit d1dc710

Browse files
iluuu1994iluuu1994
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix opcache testing in CI
2 parents 914e87e + e3f2846 commit d1dc710

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

‎.github/actions/install-linux/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ runs:
1010
sudo chmod 777 /etc/php.d
1111
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
1212
echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
13-
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
14-
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini

‎.github/workflows/nightly.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,22 @@ jobs:
7575
runTestsParameters: >-
7676
${{ matrix.run_tests_parameters }}
7777
-d zend_extension=opcache.so
78+
-d opcache.enable_cli=1
7879
-d opcache.jit_buffer_size=16M
7980
- name: Test OpCache
8081
uses: ./.github/actions/test-linux
8182
with:
8283
runTestsParameters: >-
8384
${{ matrix.run_tests_parameters }}
8485
-d zend_extension=opcache.so
86+
-d opcache.enable_cli=1
8587
- name: Test Function JIT
8688
uses: ./.github/actions/test-linux
8789
with:
8890
runTestsParameters: >-
8991
${{ matrix.run_tests_parameters }}
9092
-d zend_extension=opcache.so
93+
-d opcache.enable_cli=1
9194
-d opcache.jit_buffer_size=16M
9295
-d opcache.jit=1205
9396
MACOS:
@@ -127,19 +130,22 @@ jobs:
127130
with:
128131
runTestsParameters: >-
129132
-d zend_extension=opcache.so
133+
-d opcache.enable_cli=1
130134
-d opcache.protect_memory=1
131135
-d opcache.jit_buffer_size=16M
132136
- name: Test OpCache
133137
uses: ./.github/actions/test-macos
134138
with:
135139
runTestsParameters: >-
136140
-d zend_extension=opcache.so
141+
-d opcache.enable_cli=1
137142
-d opcache.protect_memory=1
138143
- name: Test Function JIT
139144
uses: ./.github/actions/test-macos
140145
with:
141146
runTestsParameters: >-
142147
-d zend_extension=opcache.so
148+
-d opcache.enable_cli=1
143149
-d opcache.protect_memory=1
144150
-d opcache.jit_buffer_size=16M
145151
-d opcache.jit=1205

‎.github/workflows/push.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ jobs:
5353
- name: Test Tracing JIT
5454
uses: ./.github/actions/test-linux
5555
with:
56-
runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
56+
runTestsParameters: >-
57+
-d zend_extension=opcache.so
58+
-d opcache.enable_cli=1
59+
-d opcache.jit_buffer_size=16M
5760
MACOS_DEBUG_NTS:
5861
runs-on: macos-10.15
5962
steps:
@@ -78,5 +81,6 @@ jobs:
7881
with:
7982
runTestsParameters: >-
8083
-d zend_extension=opcache.so
84+
-d opcache.enable_cli=1
8185
-d opcache.protect_memory=1
8286
-d opcache.jit_buffer_size=16M

0 commit comments

Comments
 (0)
0