diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml index f3bd55365ac..6ad4d743d3a 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -1,8 +1,5 @@ name: Test inputs: - testArtifacts: - default: null - required: false runTestsParameters: default: '' required: false @@ -43,7 +40,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 }} \ @@ -55,9 +51,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 diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 15b077a4ea8..b0f461ec4e6 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -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 }} \ @@ -29,9 +25,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 diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index 1c3b3e8772c..f41b11d06f6 100644 --- a/.github/scripts/windows/test_task.bat +++ b/.github/scripts/windows/test_task.bat @@ -133,8 +133,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% diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 771b409703a..cae7a921784 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -106,14 +106,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 }} @@ -122,7 +120,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 @@ -133,7 +130,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 }} @@ -257,12 +253,9 @@ jobs: run: sudo make install - name: Test uses: ./.github/actions/test-macos - with: - testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} - name: Test Tracing JIT uses: ./.github/actions/test-macos with: - testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT jitType: tracing runTestsParameters: >- -d zend_extension=opcache.so @@ -271,7 +264,6 @@ jobs: - name: Test OpCache uses: ./.github/actions/test-macos with: - testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache runTestsParameters: >- -d zend_extension=opcache.so -d opcache.enable_cli=1 @@ -279,7 +271,6 @@ jobs: - name: Test Function JIT uses: ./.github/actions/test-macos with: - testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT jitType: function runTestsParameters: >- -d zend_extension=opcache.so diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d18527658ec..0d10c452b7c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -124,12 +124,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 ${{ matrix.asan && 'OpCache' || 'Tracing JIT' }} uses: ./.github/actions/test-linux with: - testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_${{ matrix.asan && 'OpCache' || 'Tracing JIT' }} jitType: ${{ matrix.asan && 'disable' || 'tracing' }} runTestsParameters: >- -d zend_extension=opcache.so @@ -210,7 +207,6 @@ jobs: - name: Test Tracing JIT uses: ./.github/actions/test-macos with: - testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT jitType: tracing runTestsParameters: >- -d zend_extension=opcache.so