Project

General

Profile

Make a new release » History » Version 29

msuraev, 07/12/2017 02:15 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
*FIXME:* following part is disputable and should be fixed
12 29 msuraev
13 16 msuraev
As soon as a feature is added to one Osmocom project that is needed for another dependent project to compile, we should tag at least a minor-revision bump in the depended-upon project and require it in the depending project's configure.ac. To illustrate, let's look at this example:
14
15 1 neels
Among others, @openbsc@ depends on the libraries built from @libosmocore@, for example @libosmogsm@.
16
As soon as the @libosmogsm@ library gets a new feature used by @openbsc@, like something was added to
17
@gsm_utils.h@, we shall
18 6 neels
* tag a release in @libosmocore@; say if the previous version was 0.1.2, make it at least 0.1.3.
19 1 neels
* and in @openbsc@, require @libosmogsm@ >= 0.1.3 in @configure.ac@
20 16 msuraev
21 28 msuraev
*Proposed policy:*
22 16 msuraev
* master branch is expected to depend on latest master branches of depended-upon projects
23 24 msuraev
* make release of depended-upon projects if necessary before making non-library project release
24
* make sure that we have correct version dependencies before making non-library project release
25 1 neels
26 25 msuraev
Alternatively/additionally we can make timely releases (once per XX months? before every OsmoDevCon?) of non-library projects (and corresponding depended-upon libraries) 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
27 20 msuraev
28 17 msuraev
h2. How to make a new release
29
30 21 msuraev
h3. Library release
31
32 17 msuraev
Commit changes:
33
* cleanup TODO-RELEASE file if not empty, bumping API versions accordingly (see comments in TODO-RELEASE)
34
* update debian/changelog using @gbp dch --debian-tag='%(version)s' --auto@ command
35 21 msuraev
36
h3. Non-library release
37 17 msuraev
38
TODO: more detailed description of necessary release steps:
39 19 msuraev
create, sign, publish tarball, pushing via gerrit etc.
40 17 msuraev
41 18 msuraev
h3. How to tag a new release
42 1 neels
43
The revision to tag must be merged to the public, upstream @master@ branch.
44
45
Find out the git hash for the revision you want to tag.
46
47 3 neels
Find out the next open version number. Take care: look at *all* of these:
48 1 neels
* @git tag -l@
49
* debian/changelog
50
For example, the changelog may contain versions that were forgotten to be tagged.
51
52 3 neels
Now, make a GPG-signed tag of that git hash with the next open version number.
53 1 neels
54 3 neels
Say, for example, the git hash is @012342abcdefg@ and the next open version is 0.1.3:
55 1 neels
<pre>
56 9 neels
git tag -s 0.1.3 012342abcdefg -m "release 0.1.3"
57 1 neels
</pre>
58
59 8 neels
(If @gpg@ complains, see [[Make a new release#GPG-Have-a-matching-user-id|GPG: Have a matching user id]].)
60 1 neels
61 4 neels
Verify that git picks up the new version tag:
62 1 neels
<pre>
63
$ git describe
64
0.1.3-3-g1f95179
65
</pre>
66
67 11 neels
*For your local build, _nothing will change_ until you delete the @.version@ file
68
and completely rebuild:*
69
70 1 neels
<pre>
71
rm .version
72 10 neels
autoreconf -fi
73
./configure
74 1 neels
make
75
cat .version
76
</pre>
77
78
This should show the same as @git describe@.
79
80
When you're convinced that all is in order, push the new tag:
81
82
<pre>
83
git push origin 0.1.3
84
</pre>
85
86 14 neels
If anything went wrong, you can delete the tag (locally) by
87 1 neels
<pre>
88 15 msuraev
git tag -d 0.1.3
89 14 neels
</pre>
90
and, if you've already pushed it, by
91
<pre>
92
git push --delete origin 0.1.3
93
</pre>
94 1 neels
95 26 msuraev
h2. Deprecation policy
96
97 27 msuraev
Functions/interfaces marked as deprecated for X releases of type Y can be removed in next Z release.
98 26 msuraev
99 27 msuraev
TBD: what's appropriate value for X? which Y and Z (from major/minor/patch) should we use?
100 26 msuraev
101 1 neels
h2. GPG: Have a matching user id
102
103
By default, @git tag -s@ takes your author information to lookup the secret GPG key to sign a tag with.
104
If the author+email do not exactly match one of the key's @uid@s, you will get this error:
105
106
<pre>
107
gpg: signing failed: secret key not available
108
</pre>
109
110
Verify: say, your author+email info in your git config says "John Doe <john@doe.net>", try
111
<pre>
112
gpg --list-secret-keys "John Doe <john@doe.net>"
113
</pre>
114
If this fails, GPG won't find the right key automatically.
115
116
Ways to resolve:
117
118
* Use @git tag -u <key-id>@
119
* Edit your secret key to add a uid that matches your author information
120
<pre>
121
gpg --edit-key john@doe.net
122
gpg> adduid
123
# enter details to match the git author
124
gpg> save
125
</pre>
Add picture from clipboard (Maximum size: 48.8 MB)