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 EventTile_line
- Loading branch information
Showing
91 changed files
with
2,796 additions
and
1,102 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 |
|---|---|---|
|
|
@@ -7,26 +7,36 @@ on: | |
| types: | ||
| - completed | ||
| jobs: | ||
| build: | ||
| deploy: | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request' }} | ||
| if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request' | ||
| steps: | ||
| - name: "🔍 Read PR number" | ||
| id: readctx | ||
| # we need to find the PR number that corresponds to the branch, which we do by | ||
| # searching the GH API | ||
| # We need to find the PR number that corresponds to the branch, which we do by searching the GH API | ||
| # The workflow_run event includes a list of pull requests, but it doesn't get populated for | ||
| # forked PRs: https://docs.github.com/en/rest/reference/checks#create-a-check-run | ||
| run: | | ||
| head_branch='${{github.event.workflow_run.head_repository.owner.login}}:${{github.event.workflow_run.head_branch}}' | ||
| echo "head branch: $head_branch" | ||
| echo "Head branch: $head_branch" | ||
| pulls_uri="https://api.github.com/repos/${{ github.repository }}/pulls?head=$(jq -Rr '@uri' <<<$head_branch)" | ||
| pr_number=$(curl -s -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' "$pulls_uri" | | ||
| jq -r '.[] | .number') | ||
| echo "PR number: $pr_number" | ||
| echo "::set-output name=prnumber::$pr_number" | ||
| - name: Create Deployment ID | ||
| uses: altinukshini/[email protected] | ||
| id: deployment | ||
| with: | ||
| token: "${{ secrets.ELEMENT_BOT_TOKEN }}" | ||
| pr: true | ||
| pr_id: ${{ steps.readctx.outputs.prnumber }} | ||
| transient_environment: true | ||
| environment: Netlify | ||
| initial_status: in_progress | ||
| ref: ${{ github.event.workflow_run.head_sha }} | ||
|
|
||
| # There's a 'download artifact' action but it hasn't been updated for the | ||
| # workflow_run action (https://github.com/actions/download-artifact/issues/60) | ||
| # so instead we get this mess: | ||
|
|
@@ -69,12 +79,25 @@ jobs: | |
| NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} | ||
| timeout-minutes: 1 | ||
|
|
||
| - name: Edit PR Description | ||
| uses: Beakyn/gha-comment-pull-request@2167a7aee24f9e61ce76a23039f322e49a990409 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Update deployment status (success) | ||
| if: success() | ||
| uses: altinukshini/[email protected] | ||
| with: | ||
| token: "${{ secrets.ELEMENT_BOT_TOKEN }}" | ||
| environment_url: ${{ steps.netlify.outputs.deploy-url }} | ||
| state: "success" | ||
| deployment_id: ${{ steps.deployment.outputs.deployment_id }} | ||
| pr: true | ||
| pr_id: ${{ steps.readctx.outputs.prnumber }} | ||
| description: | | ||
| Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. | ||
| Exercise caution. Use test accounts. | ||
| - name: Update deployment status (failure) | ||
| if: failure() | ||
| uses: altinukshini/[email protected] | ||
| with: | ||
| pull-request-number: ${{ steps.readctx.outputs.prnumber }} | ||
| description-message: | | ||
| Preview: ${{ steps.netlify.outputs.deploy-url }} | ||
| ⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts. | ||
| token: "${{ secrets.ELEMENT_BOT_TOKEN }}" | ||
| state: "failure" | ||
| deployment_id: ${{ steps.deployment.outputs.deployment_id }} | ||
| pr: true | ||
| pr_id: ${{ steps.readctx.outputs.prnumber }} | ||
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,4 +1,5 @@ | ||
| { | ||
| "baseUrl": "http://localhost:8080", | ||
| "videoUploadOnPasses": false | ||
| "videoUploadOnPasses": false, | ||
| "projectId": "ppvnzg" | ||
| } |
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
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,48 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| .mx_EnableLiveShare { | ||
| flex: 1 1 0; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: flex-end; | ||
| align-items: center; | ||
|
|
||
| padding: $spacing-32 $spacing-16; | ||
| text-align: center; | ||
| box-sizing: border-box; | ||
| } | ||
|
|
||
| .mx_EnableLiveShare_heading { | ||
| padding-top: $spacing-24; | ||
| } | ||
|
|
||
| .mx_EnableLiveShare_icon { | ||
| height: 58px; | ||
| width: 58px; | ||
| } | ||
|
|
||
| .mx_EnableLiveShare_description { | ||
| padding: 0 $spacing-24; | ||
| margin-bottom: $spacing-32; | ||
| line-height: $font-20px; | ||
| } | ||
|
|
||
| .mx_EnableLiveShare_button { | ||
| margin-top: $spacing-32; | ||
| height: 48px; | ||
| width: 100%; | ||
| } |
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
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
Oops, something went wrong.