Merge branch 'release/1.11.0'

lueschem · Apr 23, 2022 · e9a5c12 · e9a5c12
2 parents 6953a83 + c233dcb
commit e9a5c12
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/.github/scripts/build-package b/.github/scripts/build-package
@@ -29,6 +29,8 @@ apt-get --no-install-recommends -y install git > /dev/null
 
 git config --system user.email "lueschem@gmail.com"
 git config --system user.name "Matthias Luescher"
+git config --global --add safe.directory "$(pwd)"
+git config --global --add safe.directory "${TESTUSERHOME}/edi"
 
 if [[ $EUID -ne 0 ]]
 then

diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml
@@ -29,6 +29,9 @@ jobs:
          - distribution: ubuntu
            distribution_release: "21.10"
            repository_type: launchpad
+         - distribution: ubuntu
+           distribution_release: "22.04"
+           repository_type: launchpad
     steps:
       - name: Check out the source code
         uses: actions/checkout@v2

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+edi (1.11.0) jammy; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Added build job for Ubuntu 22.04.
+  * Fixed build failure caused by git security upgrade.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Sat, 23 Apr 2022 13:03:37 +0200
+
 edi (1.10.0) 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.10.0'
-release = '1.10.0'
+version = '1.11.0'
+release = '1.11.0'
 
 # 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.10.0'
+edi_fallback_version = '1.11.0'
 
 
 def get_edi_version():

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