Skip to content

Commit 9cec164

Browse files
iluuu1994iluuu1994
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Remove GitHub actions junit artifacts
2 parents 22ac07a + f598b58 commit 9cec164

File tree

5 files changed

+0
-35
lines changed

5 files changed

+0
-35
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Test
22
inputs:
3-
testArtifacts:
4-
default: null
5-
required: false
63
runTestsParameters:
74
default: ''
85
required: false
@@ -43,7 +40,6 @@ runs:
4340
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"
4441
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"
4542
export SKIP_IO_CAPTURE_TESTS=1
46-
export TEST_PHP_JUNIT=junit.out.xml
4743
export STACK_LIMIT_DEFAULTS_CHECK=1
4844
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
4945
-d opcache.jit=${{ inputs.jitType }} \
@@ -55,9 +51,3 @@ runs:
5551
--show-diff \
5652
--show-slow 1000 \
5753
--set-timeout 120
58-
- uses: actions/upload-artifact@v4
59-
if: always() && inputs.testArtifacts != null
60-
with:
61-
name: ${{ github.job }}_${{ inputs.testArtifacts }}
62-
path: ${{ github.workspace }}/junit.out.xml
63-
retention-days: 5

‎.github/actions/test-macos/action.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Test
22
inputs:
3-
testArtifacts:
4-
default: null
5-
required: false
63
runTestsParameters:
74
default: ''
85
required: false
@@ -17,7 +14,6 @@ runs:
1714
set -x
1815
export SKIP_IO_CAPTURE_TESTS=1
1916
export CI_NO_IPV6=1
20-
export TEST_PHP_JUNIT=junit.out.xml
2117
export STACK_LIMIT_DEFAULTS_CHECK=1
2218
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
2319
-d opcache.jit=${{ inputs.jitType }} \
@@ -29,9 +25,3 @@ runs:
2925
--show-diff \
3026
--show-slow 1000 \
3127
--set-timeout 120
32-
- uses: actions/upload-artifact@v4
33-
if: always() && inputs.testArtifacts != null
34-
with:
35-
name: ${{ github.job }}_${{ inputs.testArtifacts }}
36-
path: ${{ github.workspace }}/junit.out.xml
37-
retention-days: 5

‎.github/scripts/windows/test_task.bat

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe
133133

134134
mkdir c:\tests_tmp
135135

136-
set TEST_PHP_JUNIT=c:\junit.out.xml
137-
138136
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%"
139137

140138
set EXIT_CODE=%errorlevel%

‎.github/workflows/nightly.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,12 @@ jobs:
106106
- name: Test
107107
uses: ./.github/actions/test-linux
108108
with:
109-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
110109
runTestsParameters: >-
111110
${{ matrix.run_tests_parameters }}
112111
idleCpu: ${{ matrix.asan && 'true' || 'false' }}
113112
- name: Test Tracing JIT
114113
uses: ./.github/actions/test-linux
115114
with:
116-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
117115
jitType: tracing
118116
runTestsParameters: >-
119117
${{ matrix.run_tests_parameters }}
@@ -122,7 +120,6 @@ jobs:
122120
- name: Test OpCache
123121
uses: ./.github/actions/test-linux
124122
with:
125-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
126123
runTestsParameters: >-
127124
${{ matrix.run_tests_parameters }}
128125
-d zend_extension=opcache.so
@@ -133,7 +130,6 @@ jobs:
133130
if: matrix.test_function_jit
134131
uses: ./.github/actions/test-linux
135132
with:
136-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
137133
jitType: function
138134
runTestsParameters: >-
139135
${{ matrix.run_tests_parameters }}
@@ -257,12 +253,9 @@ jobs:
257253
run: sudo make install
258254
- name: Test
259255
uses: ./.github/actions/test-macos
260-
with:
261-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
262256
- name: Test Tracing JIT
263257
uses: ./.github/actions/test-macos
264258
with:
265-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
266259
jitType: tracing
267260
runTestsParameters: >-
268261
-d zend_extension=opcache.so
@@ -271,15 +264,13 @@ jobs:
271264
- name: Test OpCache
272265
uses: ./.github/actions/test-macos
273266
with:
274-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
275267
runTestsParameters: >-
276268
-d zend_extension=opcache.so
277269
-d opcache.enable_cli=1
278270
-d opcache.protect_memory=1
279271
- name: Test Function JIT
280272
uses: ./.github/actions/test-macos
281273
with:
282-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
283274
jitType: function
284275
runTestsParameters: >-
285276
-d zend_extension=opcache.so

‎.github/workflows/push.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,9 @@ jobs:
124124
- name: Test
125125
if: matrix.asan == false
126126
uses: ./.github/actions/test-linux
127-
with:
128-
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
129127
- name: Test ${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
130128
uses: ./.github/actions/test-linux
131129
with:
132-
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
133130
jitType: ${{ matrix.asan && 'disable' || 'tracing' }}
134131
runTestsParameters: >-
135132
-d zend_extension=opcache.so
@@ -210,7 +207,6 @@ jobs:
210207
- name: Test Tracing JIT
211208
uses: ./.github/actions/test-macos
212209
with:
213-
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
214210
jitType: tracing
215211
runTestsParameters: >-
216212
-d zend_extension=opcache.so

0 commit comments

Comments
 (0)