Merge branch 'develop' into fkwp/enable_ec_on_dev
						commit
						78ed91041b
					
				|  | @ -1,3 +1,3 @@ | |||
| _extends: matrix-org/matrix-react-sdk | ||||
| _extends: element-hq/matrix-react-sdk | ||||
| version-resolver: | ||||
|     default: patch | ||||
|  |  | |||
|  | @ -33,7 +33,7 @@ jobs: | |||
|             - name: Fetch matrix-react-sdk | ||||
|               uses: actions/checkout@v4 | ||||
|               with: | ||||
|                   repository: matrix-org/matrix-react-sdk | ||||
|                   repository: element-hq/matrix-react-sdk | ||||
|                   path: matrix-react-sdk | ||||
| 
 | ||||
|             - name: Fetch matrix-js-sdk | ||||
|  |  | |||
|  | @ -16,14 +16,14 @@ concurrency: | |||
| jobs: | ||||
|     playwright: | ||||
|         name: Playwright | ||||
|         uses: matrix-org/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop | ||||
|         uses: element-hq/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop | ||||
|         permissions: | ||||
|             actions: read | ||||
|             issues: read | ||||
|             pull-requests: read | ||||
|         with: | ||||
|             element-web-sha: ${{ github.sha }} | ||||
|             react-sdk-repository: matrix-org/matrix-react-sdk | ||||
|             react-sdk-repository: element-hq/matrix-react-sdk | ||||
|             # We only want to run the playwright tests on merge queue to prevent regressions | ||||
|             # from creeping in. They take a long time to run and consume multiple concurrent runners. | ||||
|             skip: ${{ github.event_name != 'merge_group' }} | ||||
|  |  | |||
|  | @ -62,7 +62,7 @@ jobs: | |||
|                       const repos = [ | ||||
|                           "element-hq/element-desktop", | ||||
|                           "element-hq/element-web", | ||||
|                           "matrix-org/matrix-react-sdk", | ||||
|                           "element-hq/matrix-react-sdk", | ||||
|                           "matrix-org/matrix-js-sdk", | ||||
|                       ]; | ||||
|                       const teams = [ | ||||
|  |  | |||
|  | @ -53,7 +53,7 @@ jobs: | |||
|               uses: actions/checkout@v4 | ||||
|               if: inputs.matrix-react-sdk | ||||
|               with: | ||||
|                   repository: matrix-org/matrix-react-sdk | ||||
|                   repository: element-hq/matrix-react-sdk | ||||
|                   path: matrix-react-sdk | ||||
|                   ref: staging | ||||
|                   fetch-depth: 0 | ||||
|  | @ -95,7 +95,7 @@ jobs: | |||
|               uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork | ||||
|               with: | ||||
|                   ref: staging | ||||
|                   repo: matrix-org/matrix-react-sdk | ||||
|                   repo: element-hq/matrix-react-sdk | ||||
|                   repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||||
|                   wait-interval: 10 | ||||
|                   check-name: draft | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Florian Duros
						Florian Duros