Merge branch 'release/1.12.0'

.github/workflows/package-build.yml

@@ -29,6 +29,9 @@ jobs:
          - distribution: ubuntu
            distribution_release: "22.04"
            repository_type: launchpad
+         - distribution: ubuntu
+           distribution_release: "22.10"
+           repository_type: launchpad
     steps:
       - name: Check out the source code
         uses: actions/checkout@v2

debian/changelog

@@ -1,3 +1,12 @@
+edi (1.12.0) jammy; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Skip Ansible facts gathering to reduce build time.
+  * Bugfix: Trim trailing character from scm revision.
+  * Added Ubuntu 22.10 package build.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Fri, 21 Oct 2022 09:18:05 +0200
+
 edi (1.11.3) jammy; urgency=medium
 
   [ Matthias Lüscher ]

debian/edi.postinst

@@ -4,7 +4,13 @@ set -e
 case "$1" in
     configure)
         mkdir -p /etc/bash_completion.d
-        register-python-argcomplete3 edi > /etc/bash_completion.d/edi
+        if command -v register-python-argcomplete3 > /dev/null
+        then
+            register-python-argcomplete3 edi > /etc/bash_completion.d/edi
+        else
+            # python3-argcomplete >= 2.0
+            register-python-argcomplete edi > /etc/bash_completion.d/edi
+        fi
     ;;
 
     *)
@@ -15,4 +21,4 @@ esac
 
 #DEBHELPER#
 
-exit 0
+exit 0

docs/conf.py

@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.11.3'
-release = '1.11.3'
+version = '1.12.0'
+release = '1.12.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

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.11.3'
+edi_fallback_version = '1.12.0'
 
 
 def get_edi_version():

edi/plugins/playbooks/debian/base_system/main.yml

@@ -1,4 +1,5 @@
-- hosts: edi
+- hosts: all
+  gather_facts: no
   vars:
     apply_proxy_settings: True
     configure_lxc_network_interface: True

edi/plugins/playbooks/debian/base_system_cleanup/main.yml

@@ -1,4 +1,5 @@
-- hosts: edi
+- hosts: all
+  gather_facts: no
   vars:
     regenerate_openssh_server_keys: True 
     # revert proxy settings

edi/plugins/playbooks/debian/base_system_cleanup/roles/document_artifact/templates/build.yml

@@ -1,4 +1,4 @@
 configuration_name: "{{ edi_configuration_name }}"
-project_scm_revision: "{{ project_scm_revision.stdout.strip('\n') }}"
+project_scm_revision: "{{ project_scm_revision.stdout.strip('\n').rstrip('\r') }}"
 edi_version: "{{ edi_edi_version }}"
 ansible_version: "{{ ansible_version.full }}"

edi/plugins/playbooks/debian/development_user_facilities/main.yml

@@ -1,4 +1,5 @@
-- hosts: edi
+- hosts: all
+  gather_facts: no
   vars:
     export_display: False
   roles:

edi/plugins/playbooks/debian/inherit_host_proxy_settings/main.yml

@@ -1,4 +1,5 @@
-- hosts: edi
+- hosts: all
+  gather_facts: no
   roles:
     - role: proxy_settings
       become: True

edi/plugins/playbooks/debian/lxc_networking/main.yml

@@ -1,4 +1,5 @@
-- hosts: edi
+- hosts: all
+  gather_facts: no
   vars:
     lxc_network_interface_manager: ifupdown
   roles:

setup.py

@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.11.3',
+    version='1.12.0',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,