From d8b50b57b29cf0e04cb2c260c80c94d7713c6d59 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Thu, 13 Jun 2024 11:42:21 +0200 Subject: [PATCH] Remove GitHub actions junit artifacts Nobody looks at those, and nightly regularly fails due to uploading them. --- .github/actions/test-linux/action.yml | 10 ---------- .github/actions/test-macos/action.yml | 10 ---------- .github/scripts/windows/test_task.bat | 2 -- .github/workflows/nightly.yml | 9 --------- .github/workflows/push.yml | 4 ---- 5 files changed, 35 deletions(-) diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml index 6736b269d1b3a..3329da8b641f2 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 @@ -35,7 +32,6 @@ runs: export PDO_OCI_TEST_PASS="pass" export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8" export SKIP_IO_CAPTURE_TESTS=1 - export TEST_PHP_JUNIT=junit.out.xml sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -d opcache.jit=${{ inputs.jitType }} \ -d opcache.jit_buffer_size=16M \ @@ -46,9 +42,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 a25b9d7f7d1fb..c4987bbd670a8 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 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -d opcache.jit=${{ inputs.jitType }} \ -d opcache.jit_buffer_size=16M \ @@ -28,9 +24,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 1c3b3e8772c0c..f41b11d06f6db 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 a8fdd0a867bec..76d478bc3b5cf 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -79,14 +79,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 }} @@ -95,7 +93,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 @@ -106,7 +103,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 }} @@ -226,12 +222,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 @@ -240,7 +233,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 @@ -248,7 +240,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 ceedd8b488871..662e4a4b5342c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -87,12 +87,9 @@ jobs: uses: ./.github/actions/setup-x64 - name: Test 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' }} Tracing JIT jitType: tracing runTestsParameters: >- -d zend_extension=opcache.so @@ -170,7 +167,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