Skip to content

Commit f60e164

Browse files
compulimamirmursalAmir MursalOEvgeny
authored
[QFE] Cherry-pick remove keyboard help screen to 4.17.1 (#5522)
* remove keyboard helper screen from web chat (#5234) * remove keyboard helper screen from web chat * update test case for transcript avigation isualKeyboardIndicator * update change log file for pull request changes * update test case for visual keyboard indicator * remove keyboard navigation steps in test case * Update CHANGELOG.md Co-authored-by: Eugene <[email protected]> * Update translations * Remove snapshots and test tooling * Update docs --------- Co-authored-by: Amir Mursal <[email protected]> Co-authored-by: Eugene <[email protected]> * Update entry * Use download-artifact/upload-artifact@v4 * Use docker compose * Move to MockBot4 * Merge test result * Fix tests * Update conversationStart tests * Update conversationStart tests * Update conversationStart screenshots * Skipping some tests related to MockBot4 * Use browser variant of simple-update-in * Remove unneeded tests * Fix speechRecognition.simple test * Update ignore pattern * Fix token endpoint --------- Co-authored-by: Amir Mursal <[email protected]> Co-authored-by: Amir Mursal <[email protected]> Co-authored-by: Eugene <[email protected]>
1 parent f03d1f0 commit f60e164

File tree

131 files changed

+162
-2006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+162
-2006
lines changed

.github/workflows/pull-request-validation.yml

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- run: ls -l docker.zip
7575

7676
- name: Upload Docker artifact
77-
uses: actions/upload-artifact@v3
77+
uses: actions/upload-artifact@v4
7878
with:
7979
name: docker
8080
path: docker.zip
@@ -154,9 +154,9 @@ jobs:
154154

155155
- if: always()
156156
name: Upload test results
157-
uses: actions/upload-artifact@v3
157+
uses: actions/upload-artifact@v4
158158
with:
159-
name: test-result
159+
name: test-result-unit
160160
path: |
161161
./coverage/jest-*.json
162162
./coverage/lcov-*.info
@@ -226,7 +226,7 @@ jobs:
226226
node-version: ${{ env.node-version }}
227227

228228
- name: Download Docker artifact
229-
uses: actions/download-artifact@v3
229+
uses: actions/download-artifact@v4
230230
with:
231231
name: docker
232232

@@ -236,11 +236,11 @@ jobs:
236236

237237
- run: npm clean-install
238238

239-
- name: Run docker-compose build
240-
run: docker-compose -f docker-compose-wsl2.yml build --build-arg REGISTRY=mcr.microsoft.com/mirror/docker/library
239+
- name: Run docker compose build
240+
run: docker compose -f docker-compose-wsl2.yml build --build-arg REGISTRY=mcr.microsoft.com/mirror/docker/library
241241

242-
- name: Run docker-compose up
243-
run: docker-compose -f docker-compose-wsl2.yml up --detach --scale chrome=2
242+
- name: Run docker compose up
243+
run: docker compose -f docker-compose-wsl2.yml up --detach --scale chrome=2
244244

245245
- name: Wait for Docker to be ready
246246
run: |
@@ -269,7 +269,7 @@ jobs:
269269

270270
- if: always()
271271
name: Print Docker logs
272-
run: docker-compose -f docker-compose-wsl2.yml logs
272+
run: docker compose -f docker-compose-wsl2.yml logs
273273

274274
- if: always()
275275
name: Append ID to test result
@@ -284,9 +284,9 @@ jobs:
284284

285285
- if: always()
286286
name: Upload test results
287-
uses: actions/upload-artifact@v3
287+
uses: actions/upload-artifact@v4
288288
with:
289-
name: test-result
289+
name: test-result-html-${{ matrix.shard-index }}
290290
path: |
291291
./coverage/jest-*.json
292292
./coverage/lcov-*.info
@@ -295,9 +295,9 @@ jobs:
295295
296296
- if: failure()
297297
name: Upload test snapshot diffs
298-
uses: actions/upload-artifact@v3
298+
uses: actions/upload-artifact@v4
299299
with:
300-
name: test-snapshot-diff
300+
name: test-snapshot-diff-html-${{ matrix.shard-index }}
301301
path: ./__tests__/__image_snapshots__/*/__diff_output__/*
302302

303303
merge-test-result:
@@ -309,37 +309,23 @@ jobs:
309309
runs-on: ubuntu-latest
310310

311311
steps:
312+
- name: Merge test result artifacts
313+
uses: actions/upload-artifact/merge@v4
314+
with:
315+
delete-merged: true
316+
name: test-result
317+
pattern: test-result-*
318+
312319
- name: Download test results
313-
uses: actions/download-artifact@v3
320+
uses: actions/download-artifact@v4
314321
with:
315322
name: test-result
316323

317324
- name: Install lcov
318325
run: sudo apt install -y lcov
319326

320327
- name: Merge lcov-*.info
321-
run: |
322-
lcov \
323-
--rc lcov_branch_coverage=1 \
324-
--add-tracefile lcov-1.info \
325-
--add-tracefile lcov-2.info \
326-
--add-tracefile lcov-3.info \
327-
--add-tracefile lcov-4.info \
328-
--add-tracefile lcov-5.info \
329-
--add-tracefile lcov-6.info \
330-
--add-tracefile lcov-7.info \
331-
--add-tracefile lcov-8.info \
332-
--add-tracefile lcov-9.info \
333-
--add-tracefile lcov-10.info \
334-
--add-tracefile lcov-11.info \
335-
--add-tracefile lcov-12.info \
336-
--add-tracefile lcov-13.info \
337-
--add-tracefile lcov-14.info \
338-
--add-tracefile lcov-15.info \
339-
--add-tracefile lcov-16.info \
340-
--add-tracefile lcov-17.info \
341-
--add-tracefile lcov-unit.info \
342-
--output-file lcov.info
328+
run: find . -name "lcov-*.info" -type f | xargs -i echo "--add-tracefile {}" | xargs lcov --rc lcov_branch_coverage=1 --output-file lcov.info
343329

344330
- if: always()
345331
name: Print coverage list
@@ -351,3 +337,20 @@ jobs:
351337
echo \`\`\` >> $GITHUB_STEP_SUMMARY
352338
lcov --rc lcov_branch_coverage=1 --summary lcov.info | tee --append $GITHUB_STEP_SUMMARY
353339
echo \`\`\` >> $GITHUB_STEP_SUMMARY
340+
341+
merge-test-snapshots:
342+
if: always()
343+
name: Merge test snapshots
344+
needs:
345+
- html-test
346+
runs-on: ubuntu-latest
347+
348+
steps:
349+
- continue-on-error: true # Do not error out when no artifacts to merge, see https://github.com/actions/upload-artifact/issues/524
350+
name: Merge test snapshots artifacts
351+
uses: actions/upload-artifact/merge@v4
352+
with:
353+
compression-level: 0
354+
delete-merged: true
355+
name: test-snapshot-diff
356+
pattern: test-snapshot-diff-*

CHANGELOG.md

Lines changed: 4 additions & 0 deletions

0 commit comments

Comments
 (0)