Merge branch 'release/1.18.1'

lueschem · Apr 21, 2024 · 0387a6e · 0387a6e
2 parents e0c92f5 + 9e9a45d
commit 0387a6e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml
@@ -26,6 +26,9 @@ jobs:
          - distribution: ubuntu
            distribution_release: "23.10"
            repository_type: launchpad
+         - distribution: ubuntu
+           distribution_release: "24.04"
+           repository_type: launchpad
     steps:
       - name: Check out the source code
         uses: actions/checkout@v4

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+edi (1.18.1) noble; urgency=medium
+
+  [ Matthias Luescher ]
+  * Suggest the installation of the containers-storage package.
+  * Added Ubuntu noble package build.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Sun, 21 Apr 2024 21:14:55 +0200
+
 edi (1.18.0) mantic; urgency=medium
 
   [ Matthias Luescher ]

diff --git a/debian/control b/debian/control
@@ -48,6 +48,7 @@ Depends: ${misc:Depends},
 Recommends: debian-archive-keyring,
             mmdebstrap,
 Suggests: buildah,
+          containers-storage,
           distrobox,
           dosfstools,
           e2fsprogs,

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.18.0'
-release = '1.18.0'
+version = '1.18.1'
+release = '1.18.1'
 
 # 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.18.0'
+edi_fallback_version = '1.18.1'
 
 
 def get_edi_version():

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