From ac38da277c5ad97c694ec94a74b236a00cd0e993 Mon Sep 17 00:00:00 2001 From: savoirfairelinux Date: Sat, 23 Nov 2019 00:06:07 -0500 Subject: [PATCH 1/2] Updates Jami to 20191122-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 2ef7e075d7..3141e9459d 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -950,6 +950,33 @@ Builds: - ./compile.sh --release --no-gradle ndk: r20 + - versionName: 20191122-01 + versionCode: 201 + commit: android/release_201 + 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. @@ -959,5 +986,5 @@ MaintainerNotes: |- AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 20191115-01 -CurrentVersionCode: 200 +CurrentVersion: 20191122-01 +CurrentVersionCode: 201 From 07f7fe4b3bdd8243b66eff3ae0ed62f1b5ee37bb Mon Sep 17 00:00:00 2001 From: Savoir-faire Linux Date: Mon, 25 Nov 2019 16:16:57 +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 3141e9459d..5e24ac3a1f 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -975,7 +975,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.