From 5a26e7dabe5fe9b305d75eca22bad632940a9553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Tue, 13 Nov 2018 16:42:42 +0100 Subject: [PATCH 1/4] Use the tags to determine if a version is a release or a beta one --- admin/linux/debian/scripts/git2changelog.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/admin/linux/debian/scripts/git2changelog.py b/admin/linux/debian/scripts/git2changelog.py index e73708c94..58bf9859d 100755 --- a/admin/linux/debian/scripts/git2changelog.py +++ b/admin/linux/debian/scripts/git2changelog.py @@ -73,11 +73,13 @@ def collectEntries(baseCommit, baseVersion, kind): (commit, name, email, date, revdate, subject) = line.split("\t") revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S") + kind = "beta" + if commit==newVersionCommit: result = processVersionTag(newVersionTag) if result: newVersionOrigTag = lastVersionTag - (baseVersion, kind) = result + (baseVersion, _kind) = result version=getCommitVersion(commit) @@ -88,7 +90,7 @@ def collectEntries(baseCommit, baseVersion, kind): if result: lastVersionTag = tag lastCMAKEVersion = version - (baseVersion, kind) = result + (baseVersion, _kind) = result for tag in subprocess.check_output(["git", "tag", "--points-at", @@ -132,7 +134,7 @@ if __name__ == "__main__": distribution = sys.argv[2] #entries = collectEntries("8aade24147b5313f8241a8b42331442b7f40eef9", "2.2.4", "release") - entries = collectEntries("f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1", "2.4.0", "release") + entries = collectEntries("f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1", "2.4.0", "beta") with open(sys.argv[1], "wt") as f: From 82f9ec78dc9a335384887e41e7c5f9a02e2f65ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Tue, 13 Nov 2018 16:44:20 +0100 Subject: [PATCH 2/4] Use the version kind to differentiate between target repos --- admin/linux/debian/drone-build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/admin/linux/debian/drone-build.sh b/admin/linux/debian/drone-build.sh index 1a243c989..d8cfdef52 100755 --- a/admin/linux/debian/drone-build.sh +++ b/admin/linux/debian/drone-build.sh @@ -36,12 +36,11 @@ read basever kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchang cd "${DRONE_DIR}" echo "$kind" > kind -kind="release" if test "$kind" = "beta"; then - repo=nextcloud-devs/client-alpha -else repo=nextcloud-devs/client-beta +else + repo=nextcloud-devs/client fi origsourceopt="" From bcb4b44c694406c00f286ec3da50a3a684bef2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Tue, 13 Nov 2018 16:47:06 +0100 Subject: [PATCH 3/4] Also use the correct OBS repository --- admin/linux/debian/drone-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/linux/debian/drone-build.sh b/admin/linux/debian/drone-build.sh index d8cfdef52..9f84d7b2f 100755 --- a/admin/linux/debian/drone-build.sh +++ b/admin/linux/debian/drone-build.sh @@ -6,8 +6,8 @@ shopt -s extglob PPA=ppa:nextcloud-devs/client-beta PPA_BETA=ppa:nextcloud-devs/client-alpha -OBS_PROJECT=home:ivaradi:beta -OBS_PROJECT_BETA=home:ivaradi:alpha +OBS_PROJECT=home:ivaradi +OBS_PROJECT_BETA=home:ivaradi:beta OBS_PACKAGE=nextcloud-client pull_request=${DRONE_PULL_REQUEST:=master} From f0b96445d2a4c1b10f1ef24082230b62951c9ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Tue, 13 Nov 2018 20:49:26 +0100 Subject: [PATCH 4/4] Fixed the PPA names as well --- admin/linux/debian/drone-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/linux/debian/drone-build.sh b/admin/linux/debian/drone-build.sh index 9f84d7b2f..2a9d13f78 100755 --- a/admin/linux/debian/drone-build.sh +++ b/admin/linux/debian/drone-build.sh @@ -3,8 +3,8 @@ set -xe shopt -s extglob -PPA=ppa:nextcloud-devs/client-beta -PPA_BETA=ppa:nextcloud-devs/client-alpha +PPA=ppa:nextcloud-devs/client +PPA_BETA=ppa:nextcloud-devs/client-beta OBS_PROJECT=home:ivaradi OBS_PROJECT_BETA=home:ivaradi:beta