From a5e08b1b7a910d65df3488eb3b5e716bd785a9af Mon Sep 17 00:00:00 2001 From: savoirfairelinux Date: Fri, 15 Nov 2019 18:08:09 -0500 Subject: [PATCH 1/2] Updates Jami to 20191115-01 Signed-off-by: savoirfairelinux --- metadata/cx.ring.yml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml index c25864f315..13928cc5f5 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -923,6 +923,33 @@ Builds: - ./compile.sh --release --no-gradle ndk: r20 + - versionName: 20191115-01 + versionCode: 200 + commit: android/release_200 + 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: r20a + MaintainerNotes: |- 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. @@ -932,5 +959,5 @@ MaintainerNotes: |- AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 20191113-01 -CurrentVersionCode: 199 +CurrentVersion: 20191115-01 +CurrentVersionCode: 200 From 276227936a9181287dd6287a2d926deb6a8a24d8 Mon Sep 17 00:00:00 2001 From: Savoir-faire Linux Date: Mon, 18 Nov 2019 16:29:12 +0000 Subject: [PATCH 2/2] Update cx.ring.yml --- metadata/cx.ring.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml index 13928cc5f5..2ef7e075d7 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -948,7 +948,7 @@ Builds: - export ANDROID_NDK_ROOT="$ANDROID_NDK" - export ANDROID_ABI="armeabi-v7a arm64-v8a x86" - ./compile.sh --release --no-gradle - ndk: r20a + ndk: r20 MaintainerNotes: |- Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures.