snap,ci: migrate to 22.04 / base: core22

.github/workflows/ppa-upload.yml

@@ -14,7 +14,6 @@ jobs:
       fail-fast: true
       matrix:
         release:
-        - "20.04"
         - "22.04"
         - "22.10"
         - "23.04"

.github/workflows/snap.yml

@@ -5,7 +5,7 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:
-  mir-core20:
+  mir-libs:
     runs-on: ubuntu-latest
 
     timeout-minutes: 30
@@ -27,35 +27,37 @@ jobs:
     # Only run if we have access to secrets.
     if: ${{ github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name }}
 
-    needs: [mir-core20]
+    needs: [mir-libs]
 
     runs-on: ubuntu-latest
 
     timeout-minutes: 30
 
     strategy:
       matrix:
-        snap:
-        - MirServer/mir-kiosk
-        - MirServer/mir-test-tools
-        - MirServer/egmde-confined-desktop
-        - MirServer/ubuntu-frame
+        include:
+        - snap: MirServer/mir-test-tools
+          track: 22
+        - snap: MirServer/confined-shell-wip
+          track: latest
+        - snap: MirServer/ubuntu-frame
+          track: 22
 
     steps:
     - name: Check out code
       uses: actions/checkout@v3
       with:
         repository: ${{ matrix.snap }}
-        ref: mir-build-snap
+        ref: mir-libs-build
         fetch-depth: 0  # needed for version determination
 
     - name: Tweak the stage snap
       run: |
-        sed -i 's@- mir-core20@\0/latest/edge/pr${{ github.event.number }}@' snap/snapcraft.yaml
+        sed -i 's@- mir-libs@\0/latest/edge/pr${{ github.event.number }}@' snap/snapcraft.yaml
 
     - name: Build and publish the snap
       uses: canonical/actions/build-snap@release
       with:
         snapcraft-token: ${{ secrets.SNAPCRAFT_TOKEN }}
         publish: true
-        publish-channel: edge/mir-pr${{ github.event.number }}
+        publish-channel: ${{ matrix.track }}/edge/mir-pr${{ github.event.number }}

.github/workflows/spread.yml

@@ -26,23 +26,22 @@ jobs:
         set -euo pipefail
 
         if ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}; then
-          TASKS='"lxd:ubuntu-20.04:spread/build/ubuntu:asan"
-                 "lxd:ubuntu-20.04:spread/build/ubuntu:tsan"
-                 "lxd:ubuntu-20.04:spread/build/ubuntu:ubsan"
-                 "lxd:ubuntu-20.04:spread/build/ubuntu:asan_clang"
-                 "lxd:ubuntu-20.04:spread/build/ubuntu:tsan_clang"
-                 "lxd:ubuntu-20.04:spread/build/ubuntu:ubsan_clang"'
+          TASKS='"lxd:ubuntu-22.04:spread/build/ubuntu:asan"
+                 "lxd:ubuntu-22.04:spread/build/ubuntu:tsan"
+                 "lxd:ubuntu-22.04:spread/build/ubuntu:ubsan"
+                 "lxd:ubuntu-22.04:spread/build/ubuntu:asan_clang"
+                 "lxd:ubuntu-22.04:spread/build/ubuntu:tsan_clang"
+                 "lxd:ubuntu-22.04:spread/build/ubuntu:ubsan_clang"'
         fi
 
         TASKS+='"lxd:alpine-3.17:spread/build/alpine:amd64"
                 "lxd:alpine-edge:spread/build/alpine:amd64"
                 "lxd:ubuntu-22.04:spread/build/sbuild:debian_sid"
                 "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu"
-                "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_jammy"
                 "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_arm64"
                 "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_armhf"
-                "lxd:ubuntu-20.04:spread/build/ubuntu:rpi"
-                "lxd:ubuntu-20.04:spread/build/ubuntu:clang"
+                "lxd:ubuntu-22.04:spread/build/ubuntu:rpi"
+                "lxd:ubuntu-22.04:spread/build/ubuntu:clang"
                 "lxd:fedora-36:spread/build/fedora:amd64"
                 "lxd:fedora-37:spread/build/fedora:amd64"
                 "lxd:fedora-rawhide:spread/build/fedora:amd64"

bors.toml

@@ -1,10 +1,9 @@
 status = [
           "BuildAndTest (lxd:alpine-3.17:spread/build/alpine:amd64)",
           "BuildAndTest (lxd:ubuntu-22.04:spread/build/sbuild:ubuntu)",
-          "BuildAndTest (lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_jammy)",
           "BuildAndTest (lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_arm64)",
           "BuildAndTest (lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_armhf)",
-          "BuildAndTest (lxd:ubuntu-20.04:spread/build/ubuntu:clang)",
+          "BuildAndTest (lxd:ubuntu-22.04:spread/build/ubuntu:clang)",
           "BuildAndTest (lxd:fedora-36:spread/build/fedora:amd64)",
           "BuildAndTest (lxd:fedora-37:spread/build/fedora:amd64)",
 ]

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
-name: mir-core20
-base: core20
+name: mir-libs
+base: core22
 summary: The fast, open and secure display server for any device - build environment
 description: |
   Mir is a display server running on linux systems, with a focus on efficiency,
@@ -52,10 +52,10 @@ parts:
     - python3-pil
     - systemtap-sdt-dev
     stage-packages:
-    - libboost-filesystem1.71.0
-    - libboost-iostreams1.71.0
-    - libboost-program-options1.71.0
-    - libcapnp-0.7.0
+    - libboost-filesystem1.74.0
+    - libboost-iostreams1.74.0
+    - libboost-program-options1.74.0
+    - libcapnp-0.8.0
     - libdrm2
     - libegl1
     - libepoxy0
@@ -68,17 +68,17 @@ parts:
     - libglvnd0
     - libgoogle-glog0v5
     - libgudev-1.0-0
-    - libicu66
+    - libicu70
     - libinput10
-    - liblttng-ust0
+    - liblttng-ust1
     - libmtdev1
     - libnuma1
     - libnvidia-egl-wayland1
     - libpng16-16
     - libsigc++-2.0-0v5
     - libunwind8
-    - liburcu6
-    - libwacom2
+    - liburcu8
+    - libwacom9
     - libwayland-client0
     - libwayland-egl1
     - libwayland-server0
@@ -97,8 +97,8 @@ parts:
     - libxml++2.6-2v5
     - libxml2
     - libxrender1
-    - libyaml-cpp0.6
+    - libyaml-cpp0.7
     override-pull: |
-      snapcraftctl pull
-      snapcraftctl set-version $( git describe | awk -F- '{ gsub(/^v/, "", $1); printf $1; if ($2) { printf "+dev" $2 "-" $3 } }' )
-      snapcraftctl set-grade $( [[ $( git describe ) =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo stable || echo devel )
+      craftctl default
+      craftctl set version=$( git describe | awk -F- '{ gsub(/^v/, "", $1); printf $1; if ($2) { printf "+dev" $2 "-" $3 } }' )
+      craftctl set grade=$( [[ $( git describe ) =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo stable || echo devel )

spread.yaml

@@ -7,7 +7,6 @@ backends:
         systems:
             - alpine-3.17
             - alpine-edge
-            - ubuntu-20.04
             - ubuntu-22.04
             - fedora-36
             - fedora-37
@@ -19,7 +18,6 @@ backends:
         location: snapd-spread/us-east1-b
         halt-timeout: 2h
         systems:
-            - ubuntu-20.04-64
             - ubuntu-22.04-64
             - fedora-36-64
             - fedora-37-64
@@ -32,9 +30,8 @@ environment:
     ARCH/rpi: armhf
     DISTRO: ubuntu
     DISTRO/debian_sid: debian
-    RELEASE: focal
-    RELEASE/ubuntu: focal
-    RELEASE/ubuntu_jammy: jammy
+    RELEASE: jammy
+    RELEASE/ubuntu: jammy
     RELEASE/ubuntu_devel: kinetic
     RELEASE/debian_sid: sid
     PROPOSED: false