summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Christoph Steiner <hans@eds.org>2017-10-23 11:44:59 +0200
committerHolger Levsen <holger@layer-acht.org>2017-10-23 13:41:24 +0200
commit0cbebaf3c6315a1a1b79a36f238765d33e0307fe (patch)
treecb895bbca11efba69d85a062fd7800124b73ec94
parenteae4119a4e3cc3b7a664fccbb5f10778ae254122 (diff)
downloadjenkins.debian.net-0cbebaf3c6315a1a1b79a36f238765d33e0307fe.tar.xz
reproducible fdroid: point to canonical git repos
All the big work has been merged, it is time to switch this to the canonical repos for everything! Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_fdroid_build_apps.sh5
-rwxr-xr-xbin/reproducible_setup_fdroid_build_environment.sh5
2 files changed, 8 insertions, 2 deletions
diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh
index 8e4c6bdf..815bfb50 100755
--- a/bin/reproducible_fdroid_build_apps.sh
+++ b/bin/reproducible_fdroid_build_apps.sh
@@ -14,6 +14,8 @@ common_init "$@"
# common code
. /srv/jenkins/bin/reproducible_common.sh
+GIT_REPO=https://gitlab.com/fdroid/fdroidserver
+
# define and clean work space on the machine actually running the
# build. jenkins.debian.net does not use Jenkins slaves. Instead
# /srv/jenkins/bin/jenkins_master_wrapper.sh runs this script on the
@@ -23,6 +25,7 @@ export WORKSPACE=$BASE/reproducible_fdroid_build_apps
if [ -e $WORKSPACE/.git ]; then
# reuse the git repo if possible, to keep all the setup in fdroiddata/
cd $WORKSPACE
+ git remote set-url origin $GIT_REPO
git fetch --tags
git clean -fdx
git reset --hard
@@ -31,7 +34,7 @@ if [ -e $WORKSPACE/.git ]; then
git clean -fdx
else
rm -rf $WORKSPACE
- git clone https://gitlab.com/eighthave/fdroidserver-for-jenkins.debian.net $WORKSPACE
+ git clone $GIT_REPO $WORKSPACE
cd $WORKSPACE
fi
diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh
index a2f42cca..1150720c 100755
--- a/bin/reproducible_setup_fdroid_build_environment.sh
+++ b/bin/reproducible_setup_fdroid_build_environment.sh
@@ -14,6 +14,8 @@ common_init "$@"
# common code
. /srv/jenkins/bin/reproducible_common.sh
+GIT_REPO=https://gitlab.com/fdroid/fdroidserver
+
# define and clean work space on the machine actually running the
# build. jenkins.debian.net does not use Jenkins slaves. Instead
# /srv/jenkins/bin/jenkins_master_wrapper.sh runs this script on the
@@ -23,6 +25,7 @@ export WORKSPACE=$BASE/reproducible_setup_fdroid_build_environment
if [ -e $WORKSPACE/.git ]; then
# reuse the git repo if possible, to keep all the setup in fdroiddata/
cd $WORKSPACE
+ git remote set-url origin $GIT_REPO
git fetch --tags
git clean -fdx
git reset --hard
@@ -31,7 +34,7 @@ if [ -e $WORKSPACE/.git ]; then
git clean -fdx
else
rm -rf $WORKSPACE
- git clone https://gitlab.com/eighthave/fdroidserver-for-jenkins.debian.net $WORKSPACE
+ git clone $GIT_REPO $WORKSPACE
cd $WORKSPACE
fi