Skip to content

Commit 7a68d52

Browse files
dotani1111dotani1111
authored
Merge branch '4.3' into feature/plugin-e2e-playwright
2 parents b3bad78 + 20f469c commit 7a68d52

8 files changed

Lines changed: 37 additions & 38 deletions

File tree

‎.github/workflows/coverage.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
php -c php.ini -dpcov.enabled=1 vendor/bin/phpunit --exclude-group cache-clear,cache-clear-install,update-schema-doctrine --coverage-clover=coverage1.xml
7171
- name: Upload report
7272
if: success()
73-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
73+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
7474
with:
7575
name: phpunit-reports
7676
path: coverage1.xml
@@ -224,19 +224,19 @@ jobs:
224224
sed -i "s|%GITHUB_WORKSPACE%|${GITHUB_WORKSPACE}|g" codeception/_envs/github_action.yml
225225
php -dpcov.enabled=1 vendor/bin/codecept -vvv run acceptance --env chrome,github_action -g ${GROUP} --skip-group excludeCoverage --coverage --coverage-xml
226226
- name: Upload outputs
227-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
227+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
228228
with:
229229
name: codeception-${{ matrix.group }}-evidence
230230
path: codeception/_output/
231231
- name: Upload report
232232
if: success()
233-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
233+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
234234
with:
235235
name: codeception-${{ matrix.group }}-reports
236236
path: codeception/_output/**/*.xml
237237
- name: Upload logs
238238
if: failure()
239-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
239+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
240240
with:
241241
name: codeception-${{ matrix.group }}-logs
242242
path: var/log/

‎.github/workflows/dockerbuild.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
type=ref,event=pr,prefix=${{ matrix.php }}-apache-pr-
7777
7878
- name: Build and export to Docker
79-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
79+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
8080
with:
8181
context: .
8282
load: true
@@ -124,7 +124,7 @@ jobs:
124124
## see https://docs.github.com/ja/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#publishing-a-package-using-an-action
125125

126126
- name: Push Docker image
127-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
127+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
128128
if: success()
129129
with:
130130
context: .
@@ -136,13 +136,13 @@ jobs:
136136

137137
- name: Upload evidence
138138
if: failure()
139-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
139+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
140140
with:
141141
name: codeception-${{ matrix.group }}-evidence
142142
path: codeception/_output/
143143
- name: Upload logs
144144
if: failure()
145-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
145+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
146146
with:
147147
name: codeception-${{ matrix.group }}-logs
148148
path: var/log/

‎.github/workflows/e2e-test-throttling.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205

206206
- name: Upload Playwright report
207207
if: failure()
208-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
208+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
209209
with:
210210
name: playwright-throttling-${{ matrix.method }}-report
211211
path: e2e/playwright-report/
@@ -219,7 +219,7 @@ jobs:
219219

220220
- name: Upload logs
221221
if: failure()
222-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
222+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
223223
with:
224224
name: playwright-throttling-${{ matrix.method }}-logs
225225
path: var/log/

‎.github/workflows/e2e-test.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,21 +165,20 @@ jobs:
165165
166166
- name: Upload Playwright report
167167
if: failure()
168-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
168+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
169169
with:
170170
name: playwright-${{ matrix.suite }}-report
171171
path: e2e/playwright-report/
172172

173-
- name: Upload test results
174-
if: failure()
175-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
173+
- name: Upload ScreenShots
174+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
176175
with:
177176
name: playwright-${{ matrix.suite }}-results
178177
path: e2e/test-results/
179178

180179
- name: Upload logs
181180
if: failure()
182-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
181+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
183182
with:
184183
name: playwright-${{ matrix.suite }}-logs
185184
path: var/log/

‎.github/workflows/plugin-test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ jobs:
143143

144144
- name: Upload traces
145145
if: failure()
146-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
146+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
147147
with:
148148
name: plugin-install-${{ matrix.method }}-${{ matrix.db }}-traces
149149
path: e2e/test-results/
150150
- name: Upload logs
151151
if: failure()
152-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
152+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
153153
with:
154154
name: plugin-install-${{ matrix.method }}-${{ matrix.db }}-logs
155155
path: var/log/
@@ -286,13 +286,13 @@ jobs:
286286

287287
- name: Upload traces
288288
if: failure()
289-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
289+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
290290
with:
291291
name: plugin-update-${{ matrix.method }}-${{ matrix.db }}-traces
292292
path: e2e/test-results/
293293
- name: Upload logs
294294
if: failure()
295-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
295+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
296296
with:
297297
name: plugin-update-${{ matrix.method }}-${{ matrix.db }}-logs
298298
path: var/log/
@@ -429,13 +429,13 @@ jobs:
429429

430430
- name: Upload traces
431431
if: failure()
432-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
432+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
433433
with:
434434
name: plugin-extend-${{ matrix.method }}-${{ matrix.db }}-traces
435435
path: e2e/test-results/
436436
- name: Upload logs
437437
if: failure()
438-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
438+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
439439
with:
440440
name: plugin-extend-${{ matrix.method }}-${{ matrix.db }}-logs
441441
path: var/log/
@@ -575,13 +575,13 @@ jobs:
575575

576576
- name: Upload traces
577577
if: failure()
578-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
578+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
579579
with:
580580
name: plugin-depend-${{ matrix.method }}-${{ matrix.db }}-traces
581581
path: e2e/test-results/
582582
- name: Upload logs
583583
if: failure()
584-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
584+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
585585
with:
586586
name: plugin-depend-${{ matrix.method }}-${{ matrix.db }}-logs
587587
path: var/log/

‎.github/workflows/vaddy-1.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
vendor/bin/codecept -vvv run acceptance --env chrome,local,vaddy VaddyCest:commit
198198
199199
- name: Upload report
200-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
200+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
201201
with:
202202
name: crawl-reports-${{ matrix.vaddy_project }}-command1
203203
path: codeception/_output/**/*
@@ -265,7 +265,7 @@ jobs:
265265
266266
- name: Upload report
267267
if: ${{ matrix.command2 != '' && success() }}
268-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
268+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
269269
with:
270270
name: crawl-reports-${{ matrix.vaddy_project }}-command2
271271
path: codeception/_output/**/*
@@ -334,7 +334,7 @@ jobs:
334334
335335
- name: Upload report
336336
if: ${{ matrix.command3 != '' && success() }}
337-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
337+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
338338
with:
339339
name: crawl-reports-${{ matrix.vaddy_project }}-command3
340340
path: codeception/_output/**/*
@@ -403,7 +403,7 @@ jobs:
403403
404404
- name: Upload report
405405
if: ${{ matrix.command4 != '' && success() }}
406-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
406+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
407407
with:
408408
name: crawl-reports-${{ matrix.vaddy_project }}-command4
409409
path: codeception/_output/**/*
@@ -472,7 +472,7 @@ jobs:
472472
473473
- name: Upload report
474474
if: ${{ matrix.command5 != '' && success() }}
475-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
475+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
476476
with:
477477
name: crawl-reports-${{ matrix.vaddy_project }}-command5
478478
path: codeception/_output/**/*

‎.github/workflows/vaddy-2.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
vendor/bin/codecept -vvv run acceptance --env chrome,local,vaddy VaddyCest:commit
199199
200200
- name: Upload report
201-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
201+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
202202
with:
203203
name: crawl-reports-${{ matrix.vaddy_project }}-command1
204204
path: codeception/_output/**/*
@@ -266,7 +266,7 @@ jobs:
266266
267267
- name: Upload report
268268
if: ${{ matrix.command2 != '' && success() }}
269-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
269+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
270270
with:
271271
name: crawl-reports-${{ matrix.vaddy_project }}-command2
272272
path: codeception/_output/**/*
@@ -335,7 +335,7 @@ jobs:
335335
336336
- name: Upload report
337337
if: ${{ matrix.command3 != '' && success() }}
338-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
338+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
339339
with:
340340
name: crawl-reports-${{ matrix.vaddy_project }}-command3
341341
path: codeception/_output/**/*
@@ -404,7 +404,7 @@ jobs:
404404
405405
- name: Upload report
406406
if: ${{ matrix.command4 != '' && success() }}
407-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
407+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
408408
with:
409409
name: crawl-reports-${{ matrix.vaddy_project }}-command4
410410
path: codeception/_output/**/*
@@ -473,7 +473,7 @@ jobs:
473473
474474
- name: Upload report
475475
if: ${{ matrix.command5 != '' && success() }}
476-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
476+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
477477
with:
478478
name: crawl-reports-${{ matrix.vaddy_project }}-command5
479479
path: codeception/_output/**/*

‎.github/workflows/zaproxy.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ jobs:
3232
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
3333

3434
- name: Container Build
35-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
35+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
3636
with:
3737
context: .
3838
tags: ec-cube
3939
outputs: type=docker,dest=/tmp/ec-cube.tar
4040

4141
# --- EC-CUBE イメージのアップロード ---
4242
- name: Upload image
43-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
43+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
4444
with:
4545
name: ec-cube
4646
path: /tmp/ec-cube.tar
@@ -372,15 +372,15 @@ jobs:
372372
373373
- name: Upload report
374374
if: ${{ always() }}
375-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
375+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
376376
with:
377377
name: zap-${{ matrix.target }}-report
378378
path: /tmp/report
379379
overwrite: true
380380

381381
- name: Upload alerts
382382
if: ${{ always() }}
383-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
383+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
384384
with:
385385
name: zap-${{ matrix.target }}-alerts
386386
path: /tmp/alerts.json
@@ -411,7 +411,7 @@ jobs:
411411
412412
jq -s 'add // []' "${files[@]}" > all_alerts.json
413413
- name: Upload alerts
414-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
414+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
415415
with:
416416
name: all_alerts
417417
path: artifacts/all_alerts.json

0 commit comments

Comments
 (0)