Skip to content

Commit 4be0d5e

Browse files
iluuu1994iluuu1994
committed
[skip ci] Sync nightly.yml with master
1 parent 10aadd6 commit 4be0d5e

File tree

1 file changed

+11
-26
lines changed

1 file changed

+11
-26
lines changed

‎.github/workflows/nightly.yml‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
community_verify_type_inference:
1212
required: true
1313
type: boolean
14+
macos_arm64_version:
15+
required: true
16+
type: string
1417
run_alpine:
1518
required: true
1619
type: boolean
@@ -129,7 +132,6 @@ jobs:
129132
jitType: tracing
130133
runTestsParameters: >-
131134
--asan -x
132-
-d zend_extension=opcache.so
133135
-d opcache.enable_cli=1
134136
- name: Extra tests
135137
uses: ./.github/actions/extra-tests
@@ -240,14 +242,12 @@ jobs:
240242
jitType: tracing
241243
runTestsParameters: >-
242244
${{ matrix.run_tests_parameters }}
243-
-d zend_extension=opcache.so
244245
-d opcache.enable_cli=1
245246
- name: Test OpCache
246247
uses: ./.github/actions/test-linux
247248
with:
248249
runTestsParameters: >-
249250
${{ matrix.run_tests_parameters }}
250-
-d zend_extension=opcache.so
251251
-d opcache.enable_cli=1
252252
- name: Test Function JIT
253253
# ASAN frequently timeouts. Each test run takes ~90 minutes, we can
@@ -258,7 +258,6 @@ jobs:
258258
jitType: function
259259
runTestsParameters: >-
260260
${{ matrix.run_tests_parameters }}
261-
-d zend_extension=opcache.so
262261
-d opcache.enable_cli=1
263262
- name: Extra tests
264263
uses: ./.github/actions/extra-tests
@@ -329,22 +328,19 @@ jobs:
329328
jitType: tracing
330329
runTestsParameters: >-
331330
${{ matrix.run_tests_parameters }}
332-
-d zend_extension=opcache.so
333331
-d opcache.enable_cli=1
334332
- name: Test OpCache
335333
uses: ./.github/actions/test-linux
336334
with:
337335
runTestsParameters: >-
338336
${{ matrix.run_tests_parameters }}
339-
-d zend_extension=opcache.so
340337
-d opcache.enable_cli=1
341338
- name: Test Function JIT
342339
uses: ./.github/actions/test-linux
343340
with:
344341
jitType: function
345342
runTestsParameters: >-
346343
${{ matrix.run_tests_parameters }}
347-
-d zend_extension=opcache.so
348344
-d opcache.enable_cli=1
349345
- name: Extra tests
350346
uses: ./.github/actions/extra-tests
@@ -354,11 +350,11 @@ jobs:
354350
matrix:
355351
debug: [true, false]
356352
zts: [true, false]
357-
os: ['13', '14']
353+
arch: ['X64', 'ARM64']
358354
exclude:
359-
- os: ${{ !inputs.run_macos_arm64 && '14' || '*never*' }}
360-
name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
361-
runs-on: macos-${{ matrix.os }}
355+
- arch: ${{ !inputs.run_macos_arm64 && 'ARM64' || '*never*' }}
356+
name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
357+
runs-on: macos-${{ matrix.arch == 'X64' && '15-intel' || inputs.macos_arm64_version }}
362358
steps:
363359
- name: git checkout
364360
uses: actions/checkout@v6
@@ -384,26 +380,23 @@ jobs:
384380
- name: Test
385381
uses: ./.github/actions/test-macos
386382
- name: Test Tracing JIT
387-
if: matrix.os != '14' || !matrix.zts
383+
if: matrix.arch == 'X64' || !matrix.zts
388384
uses: ./.github/actions/test-macos
389385
with:
390386
jitType: tracing
391387
runTestsParameters: >-
392-
-d zend_extension=opcache.so
393388
-d opcache.enable_cli=1
394389
- name: Test OpCache
395390
uses: ./.github/actions/test-macos
396391
with:
397392
runTestsParameters: >-
398-
-d zend_extension=opcache.so
399393
-d opcache.enable_cli=1
400394
- name: Test Function JIT
401-
if: matrix.os != '14' || !matrix.zts
395+
if: matrix.arch == 'X64' || !matrix.zts
402396
uses: ./.github/actions/test-macos
403397
with:
404398
jitType: function
405399
runTestsParameters: >-
406-
-d zend_extension=opcache.so
407400
-d opcache.enable_cli=1
408401
- name: Extra tests
409402
uses: ./.github/actions/extra-tests
@@ -462,9 +455,8 @@ jobs:
462455
with:
463456
jitType: tracing
464457
runTestsParameters: >-
465-
-d zend_extension=opcache.so
466458
-d opcache.enable_cli=1
467-
- uses: codecov/codecov-action@v4
459+
- uses: codecov/codecov-action@v5
468460
if: ${{ !cancelled() }}
469461
with:
470462
fail_ci_if_error: true
@@ -511,7 +503,6 @@ jobs:
511503
- name: Enable Opcache
512504
run: |
513505
echo memory_limit=-1 >> /etc/php.d/opcache.ini
514-
echo zend_extension=opcache.so > /etc/php.d/opcache.ini
515506
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
516507
echo opcache.enable=1 >> /etc/php.d/opcache.ini
517508
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
@@ -708,37 +699,32 @@ jobs:
708699
uses: ./.github/actions/test-linux
709700
with:
710701
runTestsParameters: >-
711-
-d zend_extension=opcache.so
712702
-d opcache.enable_cli=1
713703
--file-cache-prime
714704
- name: Test File Cache (prime shm, use shm)
715705
uses: ./.github/actions/test-linux
716706
with:
717707
runTestsParameters: >-
718-
-d zend_extension=opcache.so
719708
-d opcache.enable_cli=1
720709
--file-cache-use
721710
- name: Test File Cache (prime shm, use file)
722711
uses: ./.github/actions/test-linux
723712
with:
724713
runTestsParameters: >-
725-
-d zend_extension=opcache.so
726714
-d opcache.enable_cli=1
727715
--file-cache-use
728716
-d opcache.file_cache_only=1
729717
- name: Test File Cache Only (prime)
730718
uses: ./.github/actions/test-linux
731719
with:
732720
runTestsParameters: >-
733-
-d zend_extension=opcache.so
734721
-d opcache.enable_cli=1
735722
--file-cache-prime
736723
-d opcache.file_cache_only=1
737724
- name: Test File Cache Only (use)
738725
uses: ./.github/actions/test-linux
739726
with:
740727
runTestsParameters: >-
741-
-d zend_extension=opcache.so
742728
-d opcache.enable_cli=1
743729
--file-cache-use
744730
-d opcache.file_cache_only=1
@@ -827,7 +813,6 @@ jobs:
827813
with:
828814
runTestsParameters: >-
829815
--msan
830-
-d zend_extension=opcache.so
831816
-d opcache.enable_cli=1
832817
- name: Verify generated files are up to date
833818
uses: ./.github/actions/verify-generated-files
@@ -999,7 +984,7 @@ jobs:
999984
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
1000985
PHP_BUILD_OBJ_DIR: C:\obj
1001986
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
1002-
PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
987+
PHP_BUILD_SDK_BRANCH: php-sdk-2.5.0
1003988
PHP_BUILD_CRT: ${{ inputs.vs_crt_version }}
1004989
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
1005990
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"

0 commit comments

Comments
 (0)