From 55685792b375d3a91b5e8c2aa3f610d83757ba1f Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 10 May 2021 09:31:33 +0800 Subject: [PATCH] fix UpdateCheckData --- metadata/cx.ring.yml | 42 +++--------------------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml index a7066ef7a1..714d08ed6d 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -1378,42 +1378,6 @@ Builds: - ./compile.sh --release --daemon ndk: r22b - - versionName: 20210504-01 - versionCode: 297 - commit: android/release_297 - timeout: 10800 - subdir: client-android/ring-android/app - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y -t testing swig - - apt-get install -y -t stretch-backports-sloppy libarchive13 - - apt-get install -y -t stretch-backports cmake - gradle: - - noPush - rm: - - client-electron - - client-gnome - - client-ios - - client-macosx - - client-uwp - - client-qt - - plugins - - docker - - docs - - lrc - - packaging - - scripts - prebuild: - - $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' - - sed -i -e "s/ndkVersion '.*'/ndkVersion '22.1.7171670'/" build.gradle - build: - - cd ../.. - - export ANDROID_NDK_ROOT="$ANDROID_NDK" - - export ANDROID_ABI="armeabi-v7a arm64-v8a x86_64" - - ./compile.sh --release --daemon - ndk: r22b - 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. @@ -1423,6 +1387,6 @@ MaintainerNotes: |- AutoUpdateMode: Version android/release_%c UpdateCheckMode: HTTP -UpdateCheckData: https://git.jami.net/savoirfairelinux/ring-client-android/-/raw/master/ring-android/app/build.gradle|versionCode\s(\d+)|.|versionName\s"([\d-]+)" -CurrentVersion: 20210504-01 -CurrentVersionCode: 297 +UpdateCheckData: https://git.jami.net/savoirfairelinux/ring-project/-/tags?format=atom|android/release_(\d+)|https://git.jami.net/savoirfairelinux/ring-client-android/-/raw/master/ring-android/app/build.gradle|versionName\s"([\d-]+)" +CurrentVersion: 20210503-01 +CurrentVersionCode: 296