Project

General

Profile

Make a new release » History » Version 52

pespin, 03/05/2018 01:59 PM

1 22 msuraev
{{>toc}}
2
3 2 neels
h1. Make a new release
4 1 neels
5 13 msuraev
The efforts to automate the release process are tracked in https://projects.osmocom.org/issues/1861
6
7 17 msuraev
h2. When to make a new release
8 1 neels
9 16 msuraev
Various Osmocom projects depend on others.
10 1 neels
11 28 msuraev
*Proposed policy:*
12 16 msuraev
* master branch is expected to depend on latest master branches of depended-upon projects
13 24 msuraev
* make release of depended-upon projects if necessary before making non-library project release
14
* make sure that we have correct version dependencies before making non-library project release
15 1 neels
16 41 msuraev
Alternatively/additionally we can make timely releases of non-library projects (and corresponding depended-upon libraries):
17
* once per XX months?
18
* before every OsmoDevCon?
19 46 msuraev
* once YY items accumulated in TODO-RELEASE file(see [[Make_a_new_release#TODO-RELEASE-file-format-and-maintenance|TODO-RELEASE file format]])
20 41 msuraev
* when configuration/db format changes?
21
22
This would help to avoid batching too many changes together and to adhere to RERO better - see http://scalare.org/wp-content/uploads/2015/06/2015-Why-and-HowShould-OpenSource-ProjectsAdopt-Time-Based-Releases.pdf
23 20 msuraev
24 52 pespin
h2. Dependencies
25
26
The @osmo-release.mk@ requires several extra dependencies. Make sure you have them installed in your system:
27
* bumpversion
28
* git-buildpackage
29
30 17 msuraev
h2. How to make a new release
31
32 39 msuraev
First we outline specific steps for different project types, than common part. The @osmo-release.mk@ helper (installed by @libosmocore-dev@) available via @make release@ takes care of
33 1 neels
34 35 msuraev
* version bump
35
* debian/changelog update
36
* commit
37
* sign
38
* tag
39
40
Feel free to send patches implementing further automation as you see fit.
41
42 17 msuraev
h3. Library release
43 30 msuraev
44 48 msuraev
* modify @*_LIBVERSION@ in @src/Makefile.am@ as necessary according to TODO-RELEASE file
45 50 pespin
* if necessary ("current" component of @*_LIBVERSION@ was bumped) then rename @debian/lib*.install@ to match the change
46 51 pespin
* if necessary (any of @debian/lib*.install@ were renamed) then adjust @debian/control@ accordingly
47 34 msuraev
48
The release helper is trying to be smart about it and prevent making new library release with non-empty TODO-RELEASE file if @*_LIBVERSION@ is not adjusted beforehand.
49 1 neels
50
h3. Non-library release
51
52 35 msuraev
Nothing special is required ATM.
53 1 neels
54 30 msuraev
h3. Common steps
55 1 neels
56 30 msuraev
Be default @make release@ prepares 'patch' release but you can manually specify any of 'major/minor/patch' as necessary - see http://semver.org/ for details.
57 1 neels
58 36 msuraev
* @make REL=minor release@
59 30 msuraev
* inspect the latest commit which was just created
60 32 msuraev
* adjust it if necessary and re-sign (see [[Make_a_new_release#How-to-retag-a-new-release|Re-tag new release]])
61 30 msuraev
* push commit for review using @git review -f@ (see [[Gerrit]] for alternatives)
62
* push the release tag by @git push gerrit --tags@
63 38 msuraev
* consider preparing article for https://osmocom.org/news/ and sending announcement to appropriate ML for major release once release commit passed the review
64 1 neels
65 44 msuraev
h2. Which new release to make
66
67
Use following guidelines when choosing release type:
68
* major - ?? TBD
69
* minor - ?? TBD
70
* patch - ?? TBD
71
72
If unsure - ask in corresponding ML.
73
74 45 msuraev
h2. Deprecation policy
75
76
Functions/interfaces marked as deprecated for X releases of type Y can be removed in next Z release.
77
78
TBD: what's appropriate value for X? which Y and Z (from major/minor/patch) should we use?
79
80 43 msuraev
h2. TODO-RELEASE file format and maintenance
81 1 neels
82 43 msuraev
* all the strings which contain @#@ considered comment and will be ignored
83
* actual entries consists of 3 tab-separated fields:
84
# library - name of the library affected (should correspond to @lib*.pc.in@ file in project's root directory)
85
# what - API or ABI change (used as a guidance to properly bump @*_LIBVERSION@)
86
# description - textual description (will end up in changelog)
87
88
When change affecting library's API/ABI is made than new entry should be added to TODO-RELEASE according to the format above. The file will be claned-up automatically by @make release@ command.
89
90
h2. How to (re)tag a new release
91
92 47 msuraev
This might be necessary if previous release was made manually with some mistakes which have to be corrected and amended to the release commit.
93
94 36 msuraev
<pre>
95
git tag -s 0.4.0 -f -m "Release v0.4.0 on 2017-08-25."
96
</pre>
97 30 msuraev
98
This will automatically (re)sign the latest commit. You can specify which commit to sign explicitly.
99 3 neels
100 1 neels
Say, for example, the git hash is @012342abcdefg@ and the next open version is 0.1.3:
101 9 neels
<pre>
102 1 neels
git tag -s 0.1.3 012342abcdefg -m "release 0.1.3"
103
</pre>
104 8 neels
105 1 neels
(If @gpg@ complains, see [[Make a new release#GPG-Have-a-matching-user-id|GPG: Have a matching user id]].)
106 4 neels
107 1 neels
Verify that git picks up the new version tag:
108
<pre>
109
$ git describe
110
0.1.3-3-g1f95179
111
</pre>
112 11 neels
113 42 msuraev
N. B: *For your local build, _nothing will change_ until you delete the @.version@ file and completely rebuild:*
114 1 neels
115
<pre>
116 10 neels
rm .version
117
autoreconf -fi
118 1 neels
./configure
119
make
120
cat .version
121
</pre>
122
123
This should show the same as @git describe@.
124
125
When you're convinced that all is in order, push the new tag:
126
127
<pre>
128
git push origin 0.1.3
129
</pre>
130 14 neels
131 1 neels
If anything went wrong, you can delete the tag (locally) by
132 15 msuraev
<pre>
133 42 msuraev
git tag -d 0.1.3
134
</pre>
135
and, if you've already pushed it, by
136
<pre>
137
git push --delete origin 0.1.3
138
</pre>
139 1 neels
140
h2. GPG: Have a matching user id
141
142
By default, @git tag -s@ takes your author information to lookup the secret GPG key to sign a tag with.
143
If the author+email do not exactly match one of the key's @uid@s, you will get this error:
144
145
<pre>
146
gpg: signing failed: secret key not available
147
</pre>
148
149
Verify: say, your author+email info in your git config says "John Doe <john@doe.net>", try
150
<pre>
151
gpg --list-secret-keys "John Doe <john@doe.net>"
152
</pre>
153
If this fails, GPG won't find the right key automatically.
154
155
Ways to resolve:
156
157
* Use @git tag -u <key-id>@
158
* Edit your secret key to add a uid that matches your author information
159
<pre>
160
gpg --edit-key john@doe.net
161
gpg> adduid
162
# enter details to match the git author
163
gpg> save
164
</pre>
Add picture from clipboard (Maximum size: 48.8 MB)