Merge branch 'release_201912' into 'master'

New Jami revision

See merge request fdroid/fdroiddata!6103
This commit is contained in:
Marcus 2019-12-20 11:56:06 +00:00
commit df43f13a4d

View file

@ -977,6 +977,33 @@ Builds:
- ./compile.sh --release --no-gradle - ./compile.sh --release --no-gradle
ndk: r20 ndk: r20
- versionName: 20191220-01
versionCode: 207
commit: android/release_207
timeout: 10800
subdir: client-android/ring-android/app
submodules: true
gradle:
- noPush
rm:
- client-electron
- client-gnome
- client-ios
- client-macosx
- client-uwp
- client-windows
- docker
- docs
- lrc
- packaging
- scripts
build:
- cd ../..
- export ANDROID_NDK_ROOT="$ANDROID_NDK"
- export ANDROID_ABI="armeabi-v7a arm64-v8a x86"
- ./compile.sh --release --no-gradle
ndk: r20
MaintainerNotes: |- MaintainerNotes: |-
Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures. Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures.
Build failed with swig 2.0.12 from jessie but works with 3.0.10 from jessie-backports. Build failed with swig 2.0.12 from jessie but works with 3.0.10 from jessie-backports.
@ -986,5 +1013,5 @@ MaintainerNotes: |-
AutoUpdateMode: None AutoUpdateMode: None
UpdateCheckMode: None UpdateCheckMode: None
CurrentVersion: 20191217-01 CurrentVersion: 20191220-01
CurrentVersionCode: 206 CurrentVersionCode: 207