Update Ubuntu Snap build setup to core22

rgriebl · Jan 29, 2024 · 0144b3e · 0144b3e
1 parent 7034ea1
commit 0144b3e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -68,13 +68,13 @@ jobs:
 
         - name: "Ubuntu 22.04 64bit"
           artifact: "Ubuntu-22.04"
-          runs-on: ubuntu-20.04
+          runs-on: ubuntu-22.04
           os: linux
           debian_container: "buildpack-deps:22.04"
 
         - name: "Debian 12 Backend 64bit"
           artifact: "Debian-12-Backend"
-          runs-on: ubuntu-20.04
+          runs-on: ubuntu-22.04
           os: linux
           debian_container: "buildpack-deps:bookworm"
           cmake_extra_config: "-DBACKEND_ONLY=ON"
@@ -93,7 +93,7 @@ jobs:
 
         - name: "Ubuntu Snap 64bit"
           artifact: "Linux-Snap"
-          runs-on: ubuntu-20.04
+          runs-on: ubuntu-22.04
           os: linux
           snap: true
           qt_tools: tools_opensslv3_src
@@ -288,8 +288,8 @@ jobs:
     # Build for Linux (AppImage / Snap)
     #################################################
 
-    - name: Build for Linux (AppImage / Snap)
-      if: matrix.config.appimage || matrix.config.snap
+    - name: Build for Linux (AppImage)
+      if: matrix.config.appimage
       run: |
         sudo DEBIAN_FRONTEND=noninteractive apt -y update
         sudo DEBIAN_FRONTEND=noninteractive apt -y install \
@@ -302,6 +302,19 @@ jobs:
         env DESTDIR=build/BrickStore-Install cmake --install build --config RelWithDebInfo --prefix /usr
       shell: bash
 
+    - name: Build for Linux (Snap)
+      if: matrix.config.snap
+      run: |
+        sudo DEBIAN_FRONTEND=noninteractive apt -y update
+        sudo DEBIAN_FRONTEND=noninteractive apt -y install \
+            g++ cmake ninja-build libglvnd-dev libtbb-dev libxkbcommon-dev libxkbcommon-x11-0 \
+            libxcb-\* libpulse-dev libgstreamer\*1.0-dev libsecret-1-dev libva-dev
+        ${Qt6_DIR}/bin/qt-cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            ${{ matrix.config.cmake_extra_config }} -B build -S .
+        cmake --build build --config RelWithDebInfo --parallel --verbose
+        env DESTDIR=build/BrickStore-Install cmake --install build --config RelWithDebInfo --prefix /usr
+      shell: bash
+
     - name: OpenSSLv3 for Linux (AppImage / Snap)
       if: matrix.config.appimage || matrix.config.snap
       run: |
@@ -351,7 +364,6 @@ jobs:
     - name: Create Linux Snap 1
       if: matrix.config.snap
       run: |
-        sudo DEBIAN_FRONTEND=noninteractive apt -y install lxd snapcraft
         mkdir -p .linuxdeploy
         wget  -P .linuxdeploy -N "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
         chmod +x .linuxdeploy/linuxdeploy-x86_64.AppImage

diff --git a/unix/snapcraft.yaml.in b/unix/snapcraft.yaml.in
@@ -7,7 +7,7 @@ version: @VERSION@
 summary: @DESCRIPTION@
 grade: stable
 confinement: strict
-base: core20
+base: core22
 description: |
   See https://@BRICKSTORE_URL@ for more information.
 compression: lzo
@@ -20,20 +20,21 @@ apps:
   brickstore:
     command: usr/bin/brickstore
     desktop: usr/share/applications/brickstore.desktop
-    extensions: [ gnome-3-38 ]
+    extensions: [ gnome ]
     environment:
       QT_QPA_PLATFORMTHEME: gtk3
       DISABLE_WAYLAND: 1
     plugs:
       - x11
       - unity7
       - network
-      - network-bind
+      - network-manager-observe
       - network-status
       - home
       - removable-media
       - cups-control
       - camera
+      - password-manager-service
 
 parts:
   brickstore: