Differential D25930

add appstream version number into master branch too
ClosedPublic
Actions

Authored by jriddell on Dec 12 2019, 5:14 PM.

Details

Reviewers
adrianchavesfernandez
ognarb
Group Reviewers
KDE Applications
Summary

add appstream version number into master branch too which is what kde.org/applications will look in

Diff Detail

Repository
R497 Release tools
Lint
Lint Skipped
Unit
Unit Tests Skipped
jriddell requested review of this revision.Dec 12 2019, 5:14 PM
jriddell created this revision.
jriddell updated this revision to Diff 71385.Dec 12 2019, 5:49 PM

add GIT_SILENT

aacid added a subscriber: aacid.Dec 12 2019, 7:34 PM

I don't think committing to master makes sense.

Merging the bug fix branch to master, is our usual work flow, isn't it?

aacid added a comment.Feb 2 2020, 9:14 AM

Should we continue here or in https://phabricator.kde.org/D27033 ?

jriddell updated this revision to Diff 74990.Feb 4 2020, 11:38 AM

refresh, use cherry-pick -x

ognarb added a subscriber: ognarb.Feb 4 2020, 2:06 PM

Cherry-picking is not merging ;)

aacid added a comment.Feb 4 2020, 6:35 PM

Copying my comment from the other phabricator differential " i asked for merging but yesterday Jonathan said on face to face conversation that merges are hard because it will probably create conflicts on unrelated files (like CMakeLists.txt for the version that we just updated)"

So unless someone is really unhappy about cherry-pick i think it's a reasonable solution.

ognarb accepted this revision.Feb 4 2020, 7:09 PM

Ok if merging is hard, cherry picking is ok :D

This revision is now accepted and ready to land.Feb 4 2020, 7:09 PM
jriddell closed this revision.Feb 6 2020, 7:01 PM

pushed

Revision Contents
Changeset List

Diff 74990

View Options

tools/python-kde-release/kde_release/appstream.py

Loading...
View Options

tools/python-kde-release/kde_release/bugzilla.py

Loading...
View Options

tools/python-kde-release/kde_release/modules.py

Loading...