Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into yimin/da-deepLink
Browse files Browse the repository at this point in the history
  • Loading branch information
Yimin-Jin committed Jan 20, 2025
2 parents 54baef2 + 5922727 commit dc81b86
Show file tree
Hide file tree
Showing 366 changed files with 21,287 additions and 21,161 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -413,13 +413,11 @@ jobs:
passed_lists=""
failed_lists=""
skipped_lists=""
has_mos_api_failure=false
mos_api_failed_lists=""
emails="teamsfxqa@microsoft.com;"
while IFS= read -r case;
has_mos_api_failure=false
mos_api_failed_lists=""
do
if [ -z "$case" ]; then
continue
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/ui-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ jobs:

- name: create pvt file (random platform/node)
if: ${{ github.event.schedule == '0 18 * * *' }} || ${{ github.event.inputs.test-case }} == ''
working-directory: ./packages/tests
working-directory: packages/tests
run: |
pnpm --filter=@microsoft/teamsfx-test install
npx ts-node ./scripts/createRandomPVT.ts
- name: setup matrix
id: setup-matrix
working-directory: ./packages/tests
working-directory: packages/tests
run: |
matrix=""
if [ ! -z "${{ github.event.inputs.test-case }}" ]; then
Expand Down Expand Up @@ -339,7 +339,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: ttk
path: ./packages/tests
path: packages/tests

- name: Install teamsfx cli
working-directory: packages/tests
Expand All @@ -352,39 +352,39 @@ jobs:
with:
repository: OfficeDev/TeamsFx-Samples
ref: ${{ needs.setup.outputs.sample-ref }}
path: ./packages/tests/resource
path: packages/tests/resource

- name: Download samples from another repo
if: contains(matrix.test-case, 'proactive-message') || contains(matrix.test-case, 'reddit-link')
uses: actions/checkout@v3
with:
repository: OfficeDev/Microsoft-Teams-Samples
ref: main
path: ./packages/tests/resource
path: packages/tests/resource

- name: Download samples chef bot
if: contains(matrix.test-case, 'chef-bot')
uses: actions/checkout@v3
with:
repository: microsoft/teams-ai
ref: main
path: ./packages/tests/resource
path: packages/tests/resource

- name: Download samples food catalog
if: contains(matrix.test-case, 'food-catalog')
uses: actions/checkout@v3
with:
repository: pnp/graph-connectors-samples
ref: main
path: ./packages/tests/resource
path: packages/tests/resource

- name: Download samples outlook signature
if: contains(matrix.test-case, 'outlook-signature')
uses: actions/checkout@v3
with:
repository: OfficeDev/Office-Add-in-samples
ref: main
path: ./packages/tests/resource
path: packages/tests/resource

- name: Get VSCode
working-directory: packages/tests
Expand Down Expand Up @@ -468,23 +468,23 @@ jobs:
if: ${{ github.event_name != 'schedule' || success() || (failure() && github.run_attempt >= 5) }}
with:
name: test-result-${{ matrix.test-case }}-${{ matrix.os }}
path: ./packages/tests/mochawesome-report/mochawesome.json
path: packages/tests/mochawesome-report/mochawesome.json

- name: Upload screenshots
uses: actions/upload-artifact@v4
if: failure()
with:
name: screenshots ${{ matrix.test-case }} ${{ matrix.os }}
path: ./packages/tests/.test-resources/screenshots/
path: packages/tests/.test-resources/screenshots/

- name: Upload source code
uses: actions/upload-artifact@v4
if: failure()
with:
name: source code ${{ matrix.test-case }} ${{ matrix.os }}
path: |
./packages/tests/**/teamsfxuitest*/*
!./packages/tests/**/node_modules/*
packages/tests/**/teamsfxuitest*/*
!packages/tests/**/node_modules/*
- name: Upload telemetry
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -530,7 +530,7 @@ jobs:
- name: Download TestPlan
uses: actions/download-artifact@v4
with:
path: ./packages/tests/mocha-results
path: packages/tests/mocha-results

- name: Sync to Azure DevOps Test Plan
working-directory: packages/tests
Expand Down
Loading

0 comments on commit dc81b86

Please sign in to comment.