This repository has been archived by the owner on Feb 19, 2022. It is now read-only.
forked from element-hq/element-web
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Security release with updated version of Olm to fix https://matrix.org/blog/2021/12/03/pre-disclosure-upcoming-security-release-of-libolm-and-matrix-js-sdk * Fix a crash on logout
- Loading branch information
Showing
15 changed files
with
252 additions
and
84 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| name: Move pull requests asking for review to the relevant project | ||
| on: | ||
| pull_request: | ||
| types: [review_requested] | ||
| jobs: | ||
| add_design_pr_to_project: | ||
| name: Move PRs asking for design review to the design board | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: octokit/graphql-action@v2.x | ||
| id: find_team_members | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| query find_team_members($team: String!) { | ||
| organization(login: "vector-im") { | ||
| team(slug: $team) { | ||
| members { | ||
| nodes { | ||
| login | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| team: ${{ env.TEAM }} | ||
| env: | ||
| TEAM: "design" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
| - id: any_reviewers_in_the_team | ||
| run: | | ||
| echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json | ||
| echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json | ||
| jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt | ||
| jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt | ||
| if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) = 0 ]; then | ||
| echo "::set-output name=match::false" | ||
| else | ||
| echo "::set-output name=match::true" | ||
| fi | ||
| - uses: octokit/graphql-action@v2.x | ||
| id: add_to_project | ||
| if: > | ||
| (steps.any_reviewers_in_the_team.outputs.match == 'true') || | ||
| (github.event.pull_request.requested_teams.slug == env.TEAM) | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| mutation add_to_project($projectid:String!, $contentid:String!) { | ||
| addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) { | ||
| projectNextItem { | ||
| id | ||
| } | ||
| } | ||
| } | ||
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.pull_request.node_id }} | ||
| env: | ||
| PROJECT_ID: "PN_kwDOAM0swc0sUA" | ||
| TEAM: "design" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} |
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 |
|---|---|---|
| @@ -1,17 +1,11 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Runs package.sh setting the version to git hashes of the element-web, | ||
| # react-sdk & js-sdk checkouts, for the case where these dependencies | ||
| # are git checkouts. | ||
| # Runs package.sh, passing DIST_VERSION determined by git | ||
|
|
||
| set -ex | ||
|
|
||
| rm dist/element-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist | ||
|
|
||
| # Since the deps are fetched from git, we can rev-parse | ||
| REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD) | ||
| JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD) | ||
| DIST_VERSION=`$(dirname $0)/get-version-from-git.sh` | ||
|
|
||
| VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop | ||
|
|
||
| CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh | ||
| CI_PACKAGE=true DIST_VERSION=$DIST_VERSION scripts/package.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
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,10 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Echoes a version based on the git hashes of the element-web, react-sdk & js-sdk checkouts, for the case where | ||
| # these dependencies are git checkouts. | ||
|
|
||
| # Since the deps are fetched from git, we can rev-parse | ||
| REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD) | ||
| JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD) | ||
| VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop | ||
| echo $VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA |
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,8 @@ | ||
| #!/bin/bash | ||
|
|
||
| # If $1 looks like v1.2.3 or v1.2.3-foo, strip the leading v, then print it to stdout | ||
| if [[ $1 =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then | ||
| echo ${1:1} | ||
| else | ||
| echo $1 | ||
| fi |
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.