This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/obvious-data-change/16221
- Loading branch information
Showing
1,316 changed files
with
89,771 additions
and
44,115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| src/component-index.js | ||
| test/end-to-end-tests/node_modules/ | ||
| test/end-to-end-tests/element/ | ||
| test/end-to-end-tests/synapse/ | ||
| test/end-to-end-tests/lib/ | ||
| # Legacy skinning file that some people might still have | ||
| src/component-index.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| codecov: | ||
| allow_coverage_offsets: True | ||
| coverage: | ||
| status: | ||
| project: off | ||
| patch: off | ||
| comment: | ||
| layout: "diff, files" | ||
| behavior: default | ||
| require_changes: false | ||
| require_base: no | ||
| require_head: no |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| # Produce a build of element-web with this version of react-sdk | ||
| # and any matching branches of element-web and js-sdk, output it | ||
| # as an artifact and run integration tests. | ||
| name: Element Web - Build and Test | ||
| on: | ||
| pull_request: { } | ||
| push: | ||
| branches: [ develop, master ] | ||
| repository_dispatch: | ||
| types: [ upstream-sdk-notify ] | ||
| env: | ||
| # These must be set for fetchdep.sh to get the right branch | ||
| REPOSITORY: ${{ github.repository }} | ||
| PR_NUMBER: ${{ github.event.pull_request.number }} | ||
| jobs: | ||
| build: | ||
| name: "Build Element-Web" | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| cache: 'yarn' | ||
|
|
||
| - name: Fetch layered build | ||
| id: layered_build | ||
| run: | | ||
| scripts/ci/layered.sh | ||
| JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD) | ||
| REACT_SHA=$(git rev-parse --short=12 HEAD) | ||
| VECTOR_SHA=$(git -C element-web rev-parse --short=12 HEAD) | ||
| echo "::set-output name=VERSION::$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA" | ||
| - name: Copy config | ||
| run: cp element.io/develop/config.json config.json | ||
| working-directory: ./element-web | ||
|
|
||
| - name: Build | ||
| env: | ||
| CI_PACKAGE: true | ||
| VERSION: "${{ steps.layered_build.outputs.VERSION }}" | ||
| run: yarn build | ||
| working-directory: ./element-web | ||
|
|
||
| - name: Upload Artifact | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: previewbuild | ||
| path: element-web/webapp | ||
| # We'll only use this in a triggered job, then we're done with it | ||
| retention-days: 1 | ||
|
|
||
| cypress: | ||
| name: "Cypress End to End Tests" | ||
| needs: build | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Download build | ||
| uses: actions/download-artifact@v3 | ||
| with: | ||
| name: previewbuild | ||
| path: webapp | ||
|
|
||
| - name: Run Cypress tests | ||
| uses: cypress-io/github-action@v2 | ||
| with: | ||
| # The built in Electron runner seems to grind to a halt trying | ||
| # to run the tests, so use chrome. | ||
| browser: chrome | ||
| start: npx serve -p 8080 webapp | ||
| record: true | ||
| env: | ||
| # pass the Dashboard record key as an environment variable | ||
| CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} | ||
| # pass GitHub token to allow accurately detecting a build vs a re-run build | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Upload Artifact | ||
| if: failure() | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: cypress-results | ||
| path: | | ||
| cypress/screenshots | ||
| cypress/videos | ||
| cypress/synapselogs | ||
| app-tests: | ||
| name: Element Web Integration Tests | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| cache: 'yarn' | ||
|
|
||
| - name: Run tests | ||
| run: "./scripts/ci/app-tests.sh" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| name: End-to-end Tests | ||
| on: | ||
| # These tests won't work for non-develop branches at the moment as they | ||
| # won't pull in the right versions of other repos, so they're only enabled | ||
| # on develop. | ||
| push: | ||
| branches: [ develop ] | ||
| pull_request: | ||
| branches: [ develop ] | ||
| repository_dispatch: | ||
| types: [ upstream-sdk-notify ] | ||
| env: | ||
| # These must be set for fetchdep.sh to get the right branch | ||
| REPOSITORY: ${{ github.repository }} | ||
| PR_NUMBER: ${{ github.event.pull_request.number }} | ||
| jobs: | ||
| end-to-end: | ||
| runs-on: ubuntu-latest | ||
| container: vectorim/element-web-ci-e2etests-env:latest | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| cache: 'yarn' | ||
|
|
||
| - name: Prepare End-to-End tests | ||
| run: ./scripts/ci/prepare-end-to-end-tests.sh | ||
|
|
||
| - name: Run End-to-End tests | ||
| run: ./scripts/ci/run-end-to-end-tests.sh | ||
|
|
||
| - name: Archive logs | ||
| uses: actions/upload-artifact@v2 | ||
| if: ${{ always() }} | ||
| with: | ||
| path: | | ||
| test/end-to-end-tests/logs/**/* | ||
| test/end-to-end-tests/synapse/installations/consent/homeserver.log | ||
| retention-days: 14 | ||
| - name: Download previous benchmark data | ||
| uses: actions/cache@v1 | ||
| with: | ||
| path: ./cache | ||
| key: ${{ runner.os }}-benchmark | ||
|
|
||
| - name: Store benchmark result | ||
| uses: matrix-org/github-action-benchmark@jsperfentry-1 | ||
| with: | ||
| tool: 'jsperformanceentry' | ||
| output-file-path: test/end-to-end-tests/performance-entries.json | ||
| fail-on-alert: false | ||
| comment-on-alert: false | ||
| # Only temporary to monitor where failures occur | ||
| alert-comment-cc-users: '@gsouquet' | ||
| github-token: ${{ secrets.DEPLOY_GH_PAGES }} | ||
| auto-push: ${{ github.ref == 'refs/heads/develop' }} |
Oops, something went wrong.