From 0e245f1c2d764e1472ede68f94dedbc1bd2c01b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 9 May 2019 10:01:54 -0400
Subject: [PATCH] fdroid: push MR on dedicated branch
Change-Id: I7cbc5d8d8d4f70e5ae41e7c16e689ce08f0e7ee5
---
fdroidMergeRequest.sh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/fdroidMergeRequest.sh b/fdroidMergeRequest.sh
index f3abc9e69..e20f73f53 100755
--- a/fdroidMergeRequest.sh
+++ b/fdroidMergeRequest.sh
@@ -28,10 +28,10 @@ then
git -C fdroiddata pull --rebase
else
echo "fdroiddata repository does not exists"
- git clone git@gitlab.com:fdroid/fdroiddata.git
+ git clone git@gitlab.com:savoirfairelinux/fdroiddata.git
fi
-git -C fdroiddata remote add upstream git@gitlab.com:savoirfairelinux/fdroiddata.git
+git -C fdroiddata remote add upstream git@gitlab.com:fdroid/fdroiddata.git
git -C fdroiddata fetch upstream || exit
git -C fdroiddata status
git -C fdroiddata checkout upstream/master
@@ -66,10 +66,13 @@ echo "Current Version Code:${versionCode}" >> ${METADATA_FOLDER}/cx.ring.txt
rm ${METADATA_FOLDER}/cx.ring.txt_
+releaseDate=`date +\"%Y%m\"`
+releaseBranch="release/${releaseDate}"
+
git -C fdroiddata add metadata/cx.ring.txt
git -C fdroiddata commit -s -m "Updates Jami to $versionName"
git -C fdroiddata status
-git -C fdroiddata push origin HEAD:master
+git -C fdroiddata push origin HEAD:${releaseBranch}
FDROID_METADATA_PROJECT_ID=36528
SFL_METADATA_PROJECT_ID=10540147
@@ -83,7 +86,7 @@ if [ $# -ge 4 ] ; then
\"id\": 1,
\"title\": \"New Jami revision\",
\"target_branch\": \"master\",
- \"source_branch\": \"master\",
+ \"source_branch\": \"${releaseBranch}\",
\"target_project_id\": ${FDROID_METADATA_PROJECT_ID}
}"
fi
--
GitLab