summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2021-04-14 16:47:04 +0200
committerkali kaneko (leap communications) <kali@leap.se>2021-04-14 16:49:53 +0200
commit2e8f2a2e8e83fd89f956cdde886d5d9d808132da (patch)
tree84312e815be8c092dcbe22955df439969972cc92 /docs
parenteba7fe9f49a5156991ec0924ab86848fb681f03a (diff)
[pkg] modify version gen to read static version file
this can be used from any build script to distinguish the version string that will be displayed (ie: 0.21.2-debian-1) - Resolves: #468
Diffstat (limited to 'docs')
-rw-r--r--docs/build-ppa.rst11
-rw-r--r--docs/release-howto.rst16
2 files changed, 17 insertions, 10 deletions
diff --git a/docs/build-ppa.rst b/docs/build-ppa.rst
new file mode 100644
index 0000000..abc9b7e
--- /dev/null
+++ b/docs/build-ppa.rst
@@ -0,0 +1,11 @@
+ppa howto
+=========
+
+* Add changes to changelog (bump native dot-version, change release)
+* Upload changes file
+
+.. code:: bash
+
+ debuild -i -S
+ dput --force ppa:kalikaneko/ppa ../riseup-vpn_0.21.2.2_source.changes
+
diff --git a/docs/release-howto.rst b/docs/release-howto.rst
index 98bd939..a0da551 100644
--- a/docs/release-howto.rst
+++ b/docs/release-howto.rst
@@ -1,7 +1,9 @@
-how to make a release
+Release procedure
=====================
-1. Tag the release
-2. Build the latest builder image:
+1. Bump the static release file in `pkg/version`. After a release, this should read something like `0.21.2+git`. This file is used to generate version strings from tarballs.
+
+2. Tag the release
+3. Build the latest builder image:
```
make builder_image
@@ -18,13 +20,7 @@ make package_snap_in_docker
4. Build the windows installer:
-This is a bit complicated, since it is a two-stage build. It will need you have
-cloned the secrets folder containing the windows authenticode. You also have to
-have wine (32 bits) installed in your host machine.
-
-```
-make package_win_in_docker
-```
+(TBD)
5. Build the OSX package: