Skip to content

Commit 8fd1388

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Remove GitHub actions junit artifacts
2 parents 4542cc6 + 9cec164 commit 8fd1388

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
@@ -41,7 +38,6 @@ runs:
4138
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"
4239
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"
4340
export SKIP_IO_CAPTURE_TESTS=1
44-
export TEST_PHP_JUNIT=junit.out.xml
4541
export STACK_LIMIT_DEFAULTS_CHECK=1
4642
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
4743
-d opcache.jit=${{ inputs.jitType }} \
@@ -54,9 +50,3 @@ runs:
5450
--show-diff \
5551
--show-slow 1000 \
5652
--set-timeout 120
57-
- uses: actions/upload-artifact@v4
58-
if: always() && inputs.testArtifacts != null
59-
with:
60-
name: ${{ github.job }}_${{ inputs.testArtifacts }}
61-
path: ${{ github.workspace }}/junit.out.xml
62-
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 }} \
@@ -30,9 +26,3 @@ runs:
3026
--show-diff \
3127
--show-slow 1000 \
3228
--set-timeout 120
33-
- uses: actions/upload-artifact@v4
34-
if: always() && inputs.testArtifacts != null
35-
with:
36-
name: ${{ github.job }}_${{ inputs.testArtifacts }}
37-
path: ${{ github.workspace }}/junit.out.xml
38-
retention-days: 5

.github/scripts/windows/test_task.bat

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

132132
mkdir c:\tests_tmp
133133

134-
set TEST_PHP_JUNIT=c:\junit.out.xml
135-
136134
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%"
137135

138136
set EXIT_CODE=%errorlevel%

.github/workflows/nightly.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,12 @@ jobs:
104104
- name: Test
105105
uses: ./.github/actions/test-linux
106106
with:
107-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
108107
runTestsParameters: >-
109108
${{ matrix.run_tests_parameters }}
110109
idleCpu: ${{ matrix.asan && 'true' || 'false' }}
111110
- name: Test Tracing JIT
112111
uses: ./.github/actions/test-linux
113112
with:
114-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
115113
jitType: tracing
116114
runTestsParameters: >-
117115
${{ matrix.run_tests_parameters }}
@@ -120,7 +118,6 @@ jobs:
120118
- name: Test OpCache
121119
uses: ./.github/actions/test-linux
122120
with:
123-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
124121
runTestsParameters: >-
125122
${{ matrix.run_tests_parameters }}
126123
-d zend_extension=opcache.so
@@ -131,7 +128,6 @@ jobs:
131128
if: matrix.test_function_jit
132129
uses: ./.github/actions/test-linux
133130
with:
134-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
135131
jitType: function
136132
runTestsParameters: >-
137133
${{ matrix.run_tests_parameters }}
@@ -253,29 +249,24 @@ jobs:
253249
run: sudo make install
254250
- name: Test
255251
uses: ./.github/actions/test-macos
256-
with:
257-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
258252
- name: Test Tracing JIT
259253
if: matrix.test_jit
260254
uses: ./.github/actions/test-macos
261255
with:
262-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
263256
jitType: tracing
264257
runTestsParameters: >-
265258
-d zend_extension=opcache.so
266259
-d opcache.enable_cli=1
267260
- name: Test OpCache
268261
uses: ./.github/actions/test-macos
269262
with:
270-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
271263
runTestsParameters: >-
272264
-d zend_extension=opcache.so
273265
-d opcache.enable_cli=1
274266
- name: Test Function JIT
275267
if: matrix.test_jit
276268
uses: ./.github/actions/test-macos
277269
with:
278-
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
279270
jitType: function
280271
runTestsParameters: >-
281272
-d zend_extension=opcache.so

.github/workflows/push.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,9 @@ jobs:
135135
- name: Test
136136
if: matrix.asan == false
137137
uses: ./.github/actions/test-linux
138-
with:
139-
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
140138
- name: Test Tracing JIT
141139
uses: ./.github/actions/test-linux
142140
with:
143-
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_Tracing JIT
144141
jitType: tracing
145142
runTestsParameters: >-
146143
-d zend_extension=opcache.so
@@ -230,7 +227,6 @@ jobs:
230227
- name: Test Tracing JIT
231228
uses: ./.github/actions/test-macos
232229
with:
233-
testArtifacts: ${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
234230
jitType: tracing
235231
runTestsParameters: >-
236232
-d zend_extension=opcache.so

0 commit comments

Comments
 (0)