Project

General

Profile

Make a new release » History » Version 41

msuraev, 08/28/2017 09:32 AM

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
* once YY items accumulated in TODO-RELEASE file
20
* 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 17 msuraev
h2. How to make a new release
25
26 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
27 1 neels
28 35 msuraev
* version bump
29
* debian/changelog update
30
* commit
31
* sign
32
* tag
33
34
Feel free to send patches implementing further automation as you see fit.
35
36 17 msuraev
h3. Library release
37 30 msuraev
38 1 neels
* modify @*_LIBVERSION@ in @Makefile.am@ as necessary according to TODO-RELEASE file
39 34 msuraev
40
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.
41 1 neels
42
h3. Non-library release
43
44 35 msuraev
Nothing special is required ATM.
45 1 neels
46 30 msuraev
h3. Common steps
47 1 neels
48 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.
49 1 neels
50 36 msuraev
* @make REL=minor release@
51 30 msuraev
* inspect the latest commit which was just created
52 32 msuraev
* adjust it if necessary and re-sign (see [[Make_a_new_release#How-to-retag-a-new-release|Re-tag new release]])
53 30 msuraev
* push commit for review using @git review -f@ (see [[Gerrit]] for alternatives)
54
* push the release tag by @git push gerrit --tags@
55 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
56 1 neels
57 30 msuraev
h3. How to (re)tag a new release
58 1 neels
59 36 msuraev
<pre>
60
git tag -s 0.4.0 -f -m "Release v0.4.0 on 2017-08-25."
61
</pre>
62 30 msuraev
63
This will automatically (re)sign the latest commit. You can specify which commit to sign explicitly.
64 3 neels
65 1 neels
Say, for example, the git hash is @012342abcdefg@ and the next open version is 0.1.3:
66 9 neels
<pre>
67 1 neels
git tag -s 0.1.3 012342abcdefg -m "release 0.1.3"
68
</pre>
69 8 neels
70 1 neels
(If @gpg@ complains, see [[Make a new release#GPG-Have-a-matching-user-id|GPG: Have a matching user id]].)
71 4 neels
72 1 neels
Verify that git picks up the new version tag:
73
<pre>
74
$ git describe
75
0.1.3-3-g1f95179
76
</pre>
77 11 neels
78
*For your local build, _nothing will change_ until you delete the @.version@ file
79
and completely rebuild:*
80 1 neels
81
<pre>
82 10 neels
rm .version
83
autoreconf -fi
84 1 neels
./configure
85
make
86
cat .version
87
</pre>
88
89
This should show the same as @git describe@.
90
91
When you're convinced that all is in order, push the new tag:
92
93
<pre>
94
git push origin 0.1.3
95
</pre>
96 14 neels
97 1 neels
If anything went wrong, you can delete the tag (locally) by
98 15 msuraev
<pre>
99 14 neels
git tag -d 0.1.3
100
</pre>
101
and, if you've already pushed it, by
102
<pre>
103
git push --delete origin 0.1.3
104 1 neels
</pre>
105 26 msuraev
106
h2. Deprecation policy
107 27 msuraev
108 26 msuraev
Functions/interfaces marked as deprecated for X releases of type Y can be removed in next Z release.
109 27 msuraev
110 26 msuraev
TBD: what's appropriate value for X? which Y and Z (from major/minor/patch) should we use?
111 1 neels
112
h2. GPG: Have a matching user id
113
114
By default, @git tag -s@ takes your author information to lookup the secret GPG key to sign a tag with.
115
If the author+email do not exactly match one of the key's @uid@s, you will get this error:
116
117
<pre>
118
gpg: signing failed: secret key not available
119
</pre>
120
121
Verify: say, your author+email info in your git config says "John Doe <john@doe.net>", try
122
<pre>
123
gpg --list-secret-keys "John Doe <john@doe.net>"
124
</pre>
125
If this fails, GPG won't find the right key automatically.
126
127
Ways to resolve:
128
129
* Use @git tag -u <key-id>@
130
* Edit your secret key to add a uid that matches your author information
131
<pre>
132
gpg --edit-key john@doe.net
133
gpg> adduid
134
# enter details to match the git author
135
gpg> save
136
</pre>
Add picture from clipboard (Maximum size: 48.8 MB)