Skip to content

Commit

Permalink
Merge branch 'master' into android-r
Browse files Browse the repository at this point in the history
  • Loading branch information
jordimas committed Aug 11, 2023
2 parents 9257bb4 + d089856 commit 62ea451
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: CI

Expand Down Expand Up @@ -28,6 +27,6 @@ jobs:
- name: black
run: |
black --check src/
- name: black
- name: flake8
run: |
flake8 src/builder/ src/web/ --ignore E501,W503,E203,E722,E402
8 changes: 0 additions & 8 deletions cfg/projects/Element.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,9 @@
"url": "https://github.com/vector-im/element-android.git",
"type": "git"
},
"Element-x-android": {
"url": "https://github.com/vector-im/element-x-android.git",
"type": "git"
},
"Element-ios": {
"url": "https://github.com/vector-im/element-ios.git",
"type": "git"
},
"Element-x-ios": {
"url": "https://github.com/vector-im/element-x-ios.git",
"type": "git"
}
}
}
11 changes: 11 additions & 0 deletions cfg/projects/NewPipe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"project": "NewPipe",
"license" : "GPL-3.0-or-later",
"projectweb": "https://hosted.weblate.org/projects/newpipe/",
"fileset": {
"NewPipe": {
"url": "https://github.com/TeamNewPipe/NewPipe.git",
"type": "git"
}
}
}

0 comments on commit 62ea451

Please sign in to comment.