forked from element-hq/element-android
-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/vector-im/element-android i…
…nto synodim-merge-upstream
- Loading branch information
Showing
190 changed files
with
6,610 additions
and
1,575 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 |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ jobs: | |
| - run: | | ||
| npm install --save-dev @babel/plugin-transform-flow-strip-types | ||
| - name: Danger | ||
| uses: danger/[email protected].3 | ||
| uses: danger/[email protected].4 | ||
| with: | ||
| args: "--dangerfile tools/danger/dangerfile.js" | ||
| env: | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -52,7 +52,7 @@ jobs: | |
| restore-keys: | | ||
| ${{ runner.os }}-gradle- | ||
| - name: Start synapse server | ||
| uses: michaelkaye/[email protected].3 | ||
| uses: michaelkaye/[email protected].4 | ||
| with: | ||
| uploadLogs: true | ||
| httpPort: 8080 | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -66,7 +66,7 @@ jobs: | |
| yarn add danger-plugin-lint-report --dev | ||
| - name: Danger lint | ||
| if: always() | ||
| uses: danger/[email protected].3 | ||
| uses: danger/[email protected].4 | ||
| with: | ||
| args: "--dangerfile tools/danger/dangerfile-lint.js" | ||
| env: | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -50,7 +50,7 @@ jobs: | |
| - uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: 3.8 | ||
| - uses: michaelkaye/[email protected].3 | ||
| - uses: michaelkaye/[email protected].4 | ||
| with: | ||
| uploadLogs: true | ||
| httpPort: 8080 | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -29,6 +29,23 @@ jobs: | |
| labels: ['Z-Labs'] | ||
| }) | ||
| apply_Help-Wanted_label: | ||
| name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'good first issue') || | ||
| contains(github.event.issue.labels.*.name, 'Hacktoberfest') | ||
| steps: | ||
| - uses: actions/github-script@v5 | ||
| with: | ||
| script: | | ||
| github.rest.issues.addLabels({ | ||
| issue_number: context.issue.number, | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| labels: ['Help Wanted'] | ||
| }) | ||
| move_needs_info_issues: | ||
| name: X-Needs-Info issues to Need info column on triage board | ||
| runs-on: ubuntu-latest | ||
|
|
@@ -48,7 +65,13 @@ jobs: | |
| # Skip in forks | ||
| if: > | ||
| github.repository == 'vector-im/element-android' && | ||
| contains(github.event.issue.labels.*.name, 'X-Needs-Design') | ||
| contains(github.event.issue.labels.*.name, 'X-Needs-Design') && | ||
| (contains(github.event.issue.labels.*.name, 'S-Critical') && | ||
| (contains(github.event.issue.labels.*.name, 'O-Frequent') || | ||
| contains(github.event.issue.labels.*.name, 'O-Occasional')) || | ||
| (contains(github.event.issue.labels.*.name, 'S-Major') && | ||
| contains(github.event.issue.labels.*.name, 'O-Frequent')) || | ||
| contains(github.event.issue.labels.*.name, 'A11y')) | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| id: add_to_project | ||
|
|
@@ -246,3 +269,105 @@ jobs: | |
| env: | ||
| PROJECT_ID: "PN_kwDOAM0swc4ABTXY" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| ps_features1: | ||
| name: Add labelled issues to PS features team 1 | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'A-Polls') || | ||
| contains(github.event.issue.labels.*.name, 'A-Location-Sharing') || | ||
| (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') && | ||
| !contains(github.event.issue.labels.*.name, 'A-Broadcast')) || | ||
| (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') && | ||
| contains(github.event.issue.labels.*.name, 'A-User-Settings')) | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| id: add_to_project | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| mutation add_to_project($projectid:ID!,$contentid:ID!) { | ||
| addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { | ||
| item { | ||
| id | ||
| } | ||
| } | ||
| } | ||
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PVT_kwDOAM0swc4AHJKF" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| ps_features2: | ||
| name: Add labelled issues to PS features team 2 | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'A-DM-Start') || | ||
| contains(github.event.issue.labels.*.name, 'A-Broadcast') | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| id: add_to_project | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| mutation add_to_project($projectid:ID!,$contentid:ID!) { | ||
| addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { | ||
| item { | ||
| id | ||
| } | ||
| } | ||
| } | ||
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PVT_kwDOAM0swc4AHJKd" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| ps_features3: | ||
| name: Add labelled issues to PS features team 3 | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| id: add_to_project | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| mutation add_to_project($projectid:ID!,$contentid:ID!) { | ||
| addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { | ||
| item { | ||
| id | ||
| } | ||
| } | ||
| } | ||
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PVT_kwDOAM0swc4AHJKW" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| voip: | ||
| name: Add labelled issues to VoIP project board | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'Team: VoIP') | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| id: add_to_project | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| mutation add_to_project($projectid:ID!,$contentid:ID!) { | ||
| addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { | ||
| item { | ||
| id | ||
| } | ||
| } | ||
| } | ||
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PVT_kwDOAM0swc4ABMIk" | ||
| 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
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.