Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Debian/Ubuntu target repository update #824

Merged
merged 4 commits into from
Nov 14, 2018
Merged

Debian/Ubuntu target repository update #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a26e7d
Use the tags to determine if a version is a release or a beta one
ivaradi Nov 13, 2018
82f9ec7
Use the version kind to differentiate between target repos
ivaradi Nov 13, 2018
bcb4b44
Also use the correct OBS repository
ivaradi Nov 13, 2018
f0b9644
Fixed the PPA names as well
ivaradi Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions admin/linux/debian/drone-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
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: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}
Expand Down Expand Up @@ -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=""
Expand Down
8 changes: 5 additions & 3 deletions admin/linux/debian/scripts/git2changelog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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",
Expand Down Expand Up @@ -132,7 +134,7 @@ def genChangeLogEntries(f, entries, distribution):
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:
Expand Down