From 5d2e99d15c2e3fc4e217a9321b7f0f586815e34b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Tue, 24 Mar 2020 16:44:24 +0100 Subject: [PATCH] Generate alpha, beta and stable versions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: István Váradi --- admin/linux/debian/drone-build.sh | 11 +++++++++-- admin/linux/debian/scripts/git2changelog.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/admin/linux/debian/drone-build.sh b/admin/linux/debian/drone-build.sh index 1df5f21f2..3d2b96d53 100755 --- a/admin/linux/debian/drone-build.sh +++ b/admin/linux/debian/drone-build.sh @@ -4,9 +4,11 @@ set -xe shopt -s extglob PPA=ppa:nextcloud-devs/client +PPA_ALPHA=ppa:nextcloud-devs/client-alpha PPA_BETA=ppa:nextcloud-devs/client-beta OBS_PROJECT=home:ivaradi +OBS_PROJECT_ALPHA=home:ivaradi:alpha OBS_PROJECT_BETA=home:ivaradi:beta OBS_PACKAGE=nextcloud-client @@ -37,7 +39,9 @@ cd "${DRONE_DIR}" echo "$kind" > kind -if test "$kind" = "beta"; then +if test "$kind" = "alpha"; then + repo=nextcloud-devs/client-alpha +elif test "$kind" = "beta"; then repo=nextcloud-devs/client-beta else repo=nextcloud-devs/client @@ -94,7 +98,10 @@ done if test "${pull_request}" = "master"; then kind=`cat kind` - if test "$kind" = "beta"; then + if test "$kind" = "alpha"; then + PPA=$PPA_ALPHA + OBS_PROJECT=$OBS_PROJECT_ALPHA + elif test "$kind" = "beta"; then PPA=$PPA_BETA OBS_PROJECT=$OBS_PROJECT_BETA fi diff --git a/admin/linux/debian/scripts/git2changelog.py b/admin/linux/debian/scripts/git2changelog.py index a48cafe51..e15a0201b 100755 --- a/admin/linux/debian/scripts/git2changelog.py +++ b/admin/linux/debian/scripts/git2changelog.py @@ -83,7 +83,7 @@ def collectEntries(baseCommit, baseVersion, kind): revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S") revdate += "." + commit - kind = "beta" + kind = "alpha" if commit==newVersionCommit: result = processVersionTag(newVersionTag) -- 2.30.2