Merge branch 'release/1.9.6'

lueschem · Jan 7, 2022 · 3c5edc5 · 3c5edc5
2 parents b289c83 + 9dcd0ab
commit 3c5edc5
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -58,3 +58,11 @@ deploy:
     secure: g+7WMKuAXb1OqXD+h5uuxOJYvtMre7c3jEsIA4gmOlEd1ndEWZwmjFishsPDdxLM3c0PoKgo10DFy8gkTWNVYJIeFMuG/mxuxgek5fMMzLEDvbeEfgM31bBOh6IX/OAPSlmDjCb9idR65Mt6ZcQ19V86D4UAVcDoDNoB6KFfL2Ak1Fapp773D9jlns61JkeHqPZ6YmHu7r81GHo01ZYcQLCZ1kwqjTGya4gxppNyNtqps2d3X/4/kK1lJAGD3LnRgmdIflm5aqWoz4mDNRK2opKnzY4AlS9uQZbfOzLAgHMo/uCjNz0n99PMSHStFb9j/S8Em+1n5/eV53cKChqcrp3WnHmOl2wpHsrEAImcbfMr3okc6d5eqxqN9ZIEMJ0TXTNSUBhp8RZT4GY0G6e6atOxDX9cGSyJAO/ULjrB5xb7DpTdXtA5PxW4F3ly4i10kgkmR3csCnv3VTJ70UeDmiUmviCKq+ouhhD0lgYINLDFecn2jUSTChki94+PGr822pgWPIN2EKa0ciLzWi4kSuWE+KrFHjZujyefJGwOzg5VhFSuL02GpNd2OnIpjxe7hlOYY+bs1ZCsROxbE408FTyypBV36PEfUlQLiAZqpm26lAp/Rodm+Pl2lkv2ai/MSKrtjfkXIaVjfGuy1u6J2SyNlOwN4ro878Cd6LnnZe4=
   dist: debian/bullseye
   package_glob: "*deb11*"
+- provider: packagecloud
+  repository: debian
+  username: get-edi
+  skip_cleanup: true
+  token:
+    secure: g+7WMKuAXb1OqXD+h5uuxOJYvtMre7c3jEsIA4gmOlEd1ndEWZwmjFishsPDdxLM3c0PoKgo10DFy8gkTWNVYJIeFMuG/mxuxgek5fMMzLEDvbeEfgM31bBOh6IX/OAPSlmDjCb9idR65Mt6ZcQ19V86D4UAVcDoDNoB6KFfL2Ak1Fapp773D9jlns61JkeHqPZ6YmHu7r81GHo01ZYcQLCZ1kwqjTGya4gxppNyNtqps2d3X/4/kK1lJAGD3LnRgmdIflm5aqWoz4mDNRK2opKnzY4AlS9uQZbfOzLAgHMo/uCjNz0n99PMSHStFb9j/S8Em+1n5/eV53cKChqcrp3WnHmOl2wpHsrEAImcbfMr3okc6d5eqxqN9ZIEMJ0TXTNSUBhp8RZT4GY0G6e6atOxDX9cGSyJAO/ULjrB5xb7DpTdXtA5PxW4F3ly4i10kgkmR3csCnv3VTJ70UeDmiUmviCKq+ouhhD0lgYINLDFecn2jUSTChki94+PGr822pgWPIN2EKa0ciLzWi4kSuWE+KrFHjZujyefJGwOzg5VhFSuL02GpNd2OnIpjxe7hlOYY+bs1ZCsROxbE408FTyypBV36PEfUlQLiAZqpm26lAp/Rodm+Pl2lkv2ai/MSKrtjfkXIaVjfGuy1u6J2SyNlOwN4ro878Cd6LnnZe4=
+  dist: raspbian/bullseye
+  package_glob: "*deb11*"
diff --git a/README.rst b/README.rst
@@ -1,8 +1,8 @@
 Embedded Development Infrastructure - edi
 =========================================
 
-.. image:: https://travis-ci.org/lueschem/edi.svg?branch=master
-    :target: https://travis-ci.org/lueschem/edi
+.. image:: https://app.travis-ci.com/lueschem/edi.svg?branch=master
+    :target: https://app.travis-ci.com/lueschem/edi
 
 
 .. image:: https://img.shields.io/badge/deb-packagecloud.io-844fec.svg
@@ -14,8 +14,28 @@ Embedded Development Infrastructure - edi
     :alt: Documentation Status
 
 
-Driven by the DevOps mindset edi helps you to streamline your embedded development infrastructure.
-To achieve this goal, edi leverages top-notch open source technologies:
+edi is a generic tool that helps you to streamline your *e*\ mbedded *d*\ evelopment *i*\ nfrastructure.
+By itself edi does not do a lot but together with a project configuration (examples:
+`edi-pi`_, `edi-cl`_ and `edi-var`_) it unfolds its potential and you can build
+
+- artifacts like *full OS images* that can be directly flashed to a device,
+- artifacts that allow you to *update your device over the air*\ ,
+- *Linux containers* that serve as a *digital twin* of the device and can be used for development,
+  build automation, testing and even container based deployments and
+- nice *documents* about the content of your artifacts
+
+in a reproducible manner that easily fits into a modern, automated development workflow.
+
+.. _`edi-pi`: https://github.com/lueschem/edi-pi
+.. _`edi-cl`: https://github.com/lueschem/edi-cl
+.. _`edi-var`: https://github.com/lueschem/edi-var
+
+edi is proven in use and OS and container images generated by edi are running on 250k+ devices
+all around the world! edi project configurations can easily be adjusted to individual use cases
+and additional hardware devices. The setup is designed in a way that it scales up to large
+development projects.
+
+Instead of reinventing the wheel, edi leverages best of breed open source technologies:
 
 - Ansible_ is the tool of choice for doing the configuration management.
 - LXD_ allows you to run multiple OS instances on your development host. For complex target system deployments

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+edi (1.9.6) impish; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Added build for Raspberry Pi OS (bullseye).
+  * Improved README file.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Fri, 07 Jan 2022 22:37:59 +0100
+
 edi (1.9.5) impish; urgency=medium
 
   [ Matthias Lüscher ]

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.9.5'
-release = '1.9.5'
+version = '1.9.6'
+release = '1.9.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/edi/lib/versionhelpers.py b/edi/lib/versionhelpers.py
@@ -26,7 +26,7 @@
 
 # The do_release script will update this version!
 # During launchpad debuild neither the git version nor the package version is available.
-edi_fallback_version = '1.9.5'
+edi_fallback_version = '1.9.6'
 
 
 def get_edi_version():

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.9.5',
+    version='1.9.6',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,