feat(lightdm): set wayland as the default session for lightdm after i…

…nstalling raspberrypi-ui-mods
ubopod · Sep 8, 2024 · dc5fbb0 · dc5fbb0
1 parent 61e3436
commit dc5fbb0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/integration_delivery.yml b/.github/workflows/integration_delivery.yml
@@ -202,9 +202,10 @@ jobs:
             ~/.cache
             ~/.local
           key:
-            poetry-${{ matrix.runner }}-python${{ startsWith(matrix.runner,
-            'ubo-pod') && needs.dependencies.outputs.python-version ||
-            env.PYTHON_VERSION }}-${{hashFiles('poetry.lock') }}
+            poetry-${{ startsWith(matrix.runner, 'ubo-pod') && 'ubo-pod' ||
+            'ubuntu-latest' }}-python${{ startsWith(matrix.runner, 'ubo-pod') &&
+            needs.dependencies.outputs.python-version || env.PYTHON_VERSION
+            }}-${{hashFiles('poetry.lock') }}
 
       - name: Run Tests
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.16.1
+
+- feat(lightdm): set wayland as the default session for lightdm after installing raspberrypi-ui-mods
+
 ## Version 0.16.0
 
 - build(packer): remove /etc/xdg/autostart/piwiz.desktop to avoid running piwiz as we already set ubo user

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ubo-app"
-version = "0.16.0"
+version = "0.16.1"
 description = "Ubo main app, running on device initialization. A platform for running other apps."
 authors = ["Sassan Haradji <[email protected]>"]
 license = "Apache-2.0"

diff --git a/ubo_app/store/update_manager/utils.py b/ubo_app/store/update_manager/utils.py
@@ -338,7 +338,7 @@ def about_menu_items(state: UpdateManagerState) -> list[Item]:
 
 @store.view(
     lambda state: any(
-        notification.id == UPDATE_MANAGER_NOTIFICATION_ID
+        notification.id == UPDATE_MANAGER_SECOND_PHASE_NOTIFICATION_ID
         for notification in state.notifications.notifications
     ),
 )

diff --git a/ubo_app/system/install.sh b/ubo_app/system/install.sh
@@ -97,8 +97,8 @@ apt-get -y clean
 
 # Enable I2C and SPI
 set +o errexit
-sudo raspi-config nonint do_i2c 0
-sudo raspi-config nonint do_spi 0
+raspi-config nonint do_i2c 0
+raspi-config nonint do_spi 0
 set -o errexit
 
 # Define the installation path

diff --git a/ubo_app/system/system_manager/package.py b/ubo_app/system/system_manager/package.py
@@ -35,6 +35,16 @@ def package_handler(action: str, package: str) -> str:
                     ],
                     check=False,
                 )
+                subprocess.run(  # noqa: S603
+                    [
+                        '/usr/bin/env',
+                        'raspi-config',
+                        'nonint',
+                        'do_wayland',
+                        'W2',
+                    ],
+                    check=False,
+                )
             else:
                 install_package(package)
             return 'installed'