Merge branch 'PHP-8.3'

* PHP-8.3:
  Remove GitHub actions junit artifacts
This commit is contained in:
Ilija Tovilo 2024-06-13 14:09:17 +02:00
commit 8fd1388a7f
No known key found for this signature in database
GPG Key ID: 5050C66BFCD1015A
5 changed files with 0 additions and 35 deletions

View File

@ -1,8 +1,5 @@
name: Test
inputs:
testArtifacts:
default: null
required: false
runTestsParameters:
default: ''
required: false
@ -41,7 +38,6 @@ runs:
export ODBC_TEST_DSN="Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
export PDO_ODBC_TEST_DSN="odbc:Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=pdo_odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
export SKIP_IO_CAPTURE_TESTS=1
export TEST_PHP_JUNIT=junit.out.xml
export STACK_LIMIT_DEFAULTS_CHECK=1
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
-d opcache.jit=${{ inputs.jitType }} \
@ -54,9 +50,3 @@ runs:
--show-diff \
--show-slow 1000 \
--set-timeout 120
- uses: actions/upload-artifact@v4
if: always() && inputs.testArtifacts != null
with:
name: ${{ github.job }}_${{ inputs.testArtifacts }}
path: ${{ github.workspace }}/junit.out.xml
retention-days: 5

View File

@ -1,8 +1,5 @@
name: Test
inputs:
testArtifacts:
default: null
required: false
runTestsParameters:
default: ''
required: false
@ -17,7 +14,6 @@ runs:
set -x
export SKIP_IO_CAPTURE_TESTS=1
export CI_NO_IPV6=1
export TEST_PHP_JUNIT=junit.out.xml
export STACK_LIMIT_DEFAULTS_CHECK=1
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
-d opcache.jit=${{ inputs.jitType }} \
@ -30,9 +26,3 @@ runs:
--show-diff \
--show-slow 1000 \
--set-timeout 120
- uses: actions/upload-artifact@v4
if: always() && inputs.testArtifacts != null
with:
name: ${{ github.job }}_${{ inputs.testArtifacts }}
path: ${{ github.workspace }}/junit.out.xml
retention-days: 5

View File

@ -131,8 +131,6 @@ set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe
mkdir c:\tests_tmp
set TEST_PHP_JUNIT=c:\junit.out.xml
nmake test TESTS="%OPCACHE_OPTS% -g FAIL,BORK,LEAK,XLEAK --no-progress -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"
set EXIT_CODE=%errorlevel%

View File

@ -104,14 +104,12 @@ jobs:
- name: Test
uses: ./.github/actions/test-linux
with:
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
runTestsParameters: >-
${{ matrix.run_tests_parameters }}
idleCpu: ${{ matrix.asan && 'true' || 'false' }}
- name: Test Tracing JIT
uses: ./.github/actions/test-linux
with:
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
jitType: tracing
runTestsParameters: >-
${{ matrix.run_tests_parameters }}
@ -120,7 +118,6 @@ jobs:
- name: Test OpCache
uses: ./.github/actions/test-linux
with:
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
runTestsParameters: >-
${{ matrix.run_tests_parameters }}
-d zend_extension=opcache.so
@ -131,7 +128,6 @@ jobs:
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
jitType: function
runTestsParameters: >-
${{ matrix.run_tests_parameters }}
@ -253,13 +249,10 @@ jobs:
run: sudo make install
- name: Test
uses: ./.github/actions/test-macos
with:
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
- name: Test Tracing JIT
if: matrix.test_jit
uses: ./.github/actions/test-macos
with:
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
jitType: tracing
runTestsParameters: >-
-d zend_extension=opcache.so
@ -267,7 +260,6 @@ jobs:
- name: Test OpCache
uses: ./.github/actions/test-macos
with:
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
runTestsParameters: >-
-d zend_extension=opcache.so
-d opcache.enable_cli=1
@ -275,7 +267,6 @@ jobs:
if: matrix.test_jit
uses: ./.github/actions/test-macos
with:
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
jitType: function
runTestsParameters: >-
-d zend_extension=opcache.so

View File

@ -135,12 +135,9 @@ jobs:
- name: Test
if: matrix.asan == false
uses: ./.github/actions/test-linux
with:
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
- name: Test Tracing JIT
uses: ./.github/actions/test-linux
with:
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_Tracing JIT
jitType: tracing
runTestsParameters: >-
-d zend_extension=opcache.so
@ -230,7 +227,6 @@ jobs:
- name: Test Tracing JIT
uses: ./.github/actions/test-macos
with:
testArtifacts: ${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
jitType: tracing
runTestsParameters: >-
-d zend_extension=opcache.so