From a27c450c37f22067820b1deb2b7c1b6461888ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Sun, 2 Jun 2019 21:46:01 -0400 Subject: [PATCH] fdroid: update script Since https://gitlab.com/fdroid/fdroiddata/commit/494030d0bc10a64ce593d60f89dd9c1b16c62cd5 the .txt doesn't exist anymore, patch the yml instead Change-Id: Iebe451f06a75fa9fbcf44e503a14d28c38bd767c --- fdroidMergeRequest.sh | 63 ++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/fdroidMergeRequest.sh b/fdroidMergeRequest.sh index a74e711e8..dd11e4ccf 100755 --- a/fdroidMergeRequest.sh +++ b/fdroidMergeRequest.sh @@ -40,34 +40,49 @@ git -C fdroiddata config user.email mobile@savoirfairelinux.com METADATA_FOLDER=fdroiddata/metadata -cp ${METADATA_FOLDER}/cx.ring.txt ${METADATA_FOLDER}/cx.ring.txt_ - -head -n -12 ${METADATA_FOLDER}/cx.ring.txt_ > ${METADATA_FOLDER}/cx.ring.txt - -echo "Build:${versionName},${versionCode} - commit=${commit} - timeout=10800 - subdir=client-android/ring-android/app - submodules=yes - 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=${ndkVersion}" >> ${METADATA_FOLDER}/cx.ring.txt - -tail -n 13 ${METADATA_FOLDER}/cx.ring.txt_ | head -n -2 >> ${METADATA_FOLDER}/cx.ring.txt - -echo "Current Version:${versionName}" >> ${METADATA_FOLDER}/cx.ring.txt -echo "Current Version Code:${versionCode}" >> ${METADATA_FOLDER}/cx.ring.txt - -rm ${METADATA_FOLDER}/cx.ring.txt_ +cp ${METADATA_FOLDER}/cx.ring.yml ${METADATA_FOLDER}/cx.ring.yml_ + +head -n -11 ${METADATA_FOLDER}/cx.ring.yml_ > ${METADATA_FOLDER}/cx.ring.yml + +echo "- versionName: ${versionName} + versionCode: ${versionCode} + commit: ${commit} + 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: ${ndkVersion}" >> ${METADATA_FOLDER}/cx.ring.yml + + +tail -n 12 ${METADATA_FOLDER}/cx.ring.yml_ | head -n -2 >> ${METADATA_FOLDER}/cx.ring.yml + +echo "Current Version:${versionName}" >> ${METADATA_FOLDER}/cx.ring.yml +echo "Current Version Code:${versionCode}" >> ${METADATA_FOLDER}/cx.ring.yml + +rm ${METADATA_FOLDER}/cx.ring.yml_ releaseDate=`date +%Y%m` releaseBranch="release_${releaseDate}" -git -C fdroiddata add metadata/cx.ring.txt +git -C fdroiddata add metadata/cx.ring.yml git -C fdroiddata commit -s -m "Updates Jami to $versionName" git -C fdroiddata push origin HEAD:refs/heads/${releaseBranch} -f git -C fdroiddata status -- GitLab