all: move to 24.04 as the development focus (#3374)

[`release/2.16`](https://github.com/canonical/mir/tree/release/2.16) now in maintenance mode.
canonical · May 8, 2024 · 9aa2ff7 · 9aa2ff7
2 parents bd658ba + fbdc9cc
commit 9aa2ff7
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 195 deletions.
diff --git a/.github/workflows/ppa-upload.yml b/.github/workflows/ppa-upload.yml
@@ -14,7 +14,6 @@ jobs:
       fail-fast: true
       matrix:
         release:
-        - "22.04"
         - "23.10"
         - "24.04"
         - "devel"

diff --git a/.github/workflows/refresh-downstreams.yml b/.github/workflows/refresh-downstreams.yml
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
@@ -35,7 +35,6 @@ jobs:
       fail-fast: false
       matrix:
         architecture: ${{ fromJSON(needs.arches.outputs.arches) }}
-        base: ["22", "24"]
 
     steps:
     - name: Check out code
@@ -45,9 +44,6 @@ jobs:
 
     - name: Tweak the snapcraft.yaml
       run: |
-        if [ "${{ matrix.base }}" == "24" ]; then
-          mv snap/local/core24~snapcraft.yaml snap/snapcraft.yaml
-        fi
         git config --global --add safe.directory $(pwd)
         sed -i 's@version: testing@version: '$(git describe)'@' snap/snapcraft.yaml
 
@@ -59,7 +55,7 @@ jobs:
         launchpad-credentials: ${{ secrets.LAUNCHPAD_CREDENTIALS }}
         launchpad-accept-public-upload: true
         publish: ${{ github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name }}
-        publish-channel: ${{ matrix.base }}/edge/pr${{ github.event.number }}
+        publish-channel: 24/edge/pr${{ github.event.number }}
 
   snap:
     # Only run if we have access to secrets.
@@ -75,18 +71,18 @@ jobs:
       fail-fast: false
       matrix:
         snap:
-        - MirServer/mir-test-tools
-        - MirServer/confined-shell-wip
-        - MirServer/ubuntu-frame
+        - canonical/mir-test-tools
+        - canonical/confined-shell-wip
+        - canonical/ubuntu-frame
         - Miriway/Miriway
         architecture: ${{ fromJSON(needs.arches.outputs.arches) }}
         include:
-        - snap: MirServer/mir-test-tools
-          track: 22
-        - snap: MirServer/confined-shell-wip
+        - snap: canonical/mir-test-tools
+          track: 24
+        - snap: canonical/confined-shell-wip
           track: latest
-        - snap: MirServer/ubuntu-frame
-          track: 22
+        - snap: canonical/ubuntu-frame
+          track: 24
         - snap: Miriway/Miriway
           track: latest
           review-opts: --allow-classic

diff --git a/.github/workflows/spread.yml b/.github/workflows/spread.yml
@@ -30,28 +30,28 @@ jobs:
         set -euo pipefail
 
         if ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}; then
-          TASKS='"lxd:ubuntu-22.04:spread/build/ubuntu:asan"
-                 "lxd:ubuntu-22.04:spread/build/ubuntu:tsan"
-                 "lxd:ubuntu-22.04:spread/build/ubuntu:asan_clang"
-                 "lxd:ubuntu-22.04:spread/build/ubuntu:tsan_clang"'
+          TASKS='"lxd:ubuntu-24.04:spread/build/ubuntu:asan"
+                 "lxd:ubuntu-24.04:spread/build/ubuntu:tsan"
+                 "lxd:ubuntu-24.04:spread/build/ubuntu:asan_clang"
+                 "lxd:ubuntu-24.04:spread/build/ubuntu:tsan_clang"'
         fi
 
         TASKS+='"lxd:alpine-3.18:spread/build/alpine:amd64"
                 "lxd:alpine-3.19: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_mantic"
-                "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_arm64"
-                "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_armhf"
-                "lxd:ubuntu-22.04:spread/build/ubuntu:clang"
+                "lxd:ubuntu-24.04:spread/build/sbuild:debian_sid"
+                "lxd:ubuntu-24.04:spread/build/sbuild:ubuntu"
+                "lxd:ubuntu-24.04:spread/build/sbuild:ubuntu_mantic"
+                "lxd:ubuntu-24.04:spread/build/sbuild:ubuntu_arm64"
+                "lxd:ubuntu-24.04:spread/build/sbuild:ubuntu_armhf"
+                "lxd:ubuntu-24.04:spread/build/ubuntu:clang"
                 "lxd:fedora-39:spread/build/fedora:amd64"
                 "lxd:fedora-40:spread/build/fedora:amd64"
                 "lxd:fedora-rawhide:spread/build/fedora:amd64"
-                "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_devel"
-                "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_proposed"
-                "lxd:ubuntu-22.04:spread/build/ubuntu:ubsan"
-                "lxd:ubuntu-22.04:spread/build/ubuntu:ubsan_clang"'
+                "lxd:ubuntu-24.04:spread/build/sbuild:ubuntu_devel"
+                "lxd:ubuntu-24.04:spread/build/sbuild:ubuntu_proposed"
+                "lxd:ubuntu-24.04:spread/build/ubuntu:ubsan"
+                "lxd:ubuntu-24.04:spread/build/ubuntu:ubsan_clang"'
 
         echo ${TASKS:-} | jq -cs '{ "spread-task": .  }' | awk '{ print "matrix=" $0 }' >> $GITHUB_OUTPUT
 

diff --git a/snap/local/core24~snapcraft.yaml b/snap/local/core24~snapcraft.yaml
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,5 +1,6 @@
 name: mir-libs
-base: core22
+base: core24
+build-base: devel
 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,
@@ -31,7 +32,7 @@ parts:
     - libdrm-dev
     - libegl1-mesa-dev
     - libepoxy-dev
-    - libfreetype6-dev
+    - libfreetype-dev
     - libgbm-dev
     - libglm-dev
     - libgtest-dev
@@ -53,29 +54,30 @@ parts:
     - python3-pil
     - systemtap-sdt-dev
     stage-packages:
-    - libboost-filesystem1.74.0
-    - libboost-iostreams1.74.0
-    - libboost-program-options1.74.0
-    - libcapnp-0.8.0
+    - libboost-filesystem1.83.0
+    - libboost-iostreams1.83.0
+    - libboost-program-options1.83.0
+    - libcapnp-1.0.1
     - libdrm2
     - libegl1
     - libepoxy0
     - libevdev2
     - libfreetype6
     - libgbm1
     - libgles2
-    - libglibmm-2.4-1v5
+    - libglib2.0-0t64
+    - libglibmm-2.4-1t64
     - libglvnd0
     - libgudev-1.0-0
-    - libicu70
+    - libicu74
     - libinput10
-    - liblttng-ust1
-    - libmtdev1
+    - liblttng-ust1t64
+    - libmtdev1t64
     - libnuma1
     - libnvidia-egl-wayland1
-    - libpng16-16
+    - libpng16-16t64
     - libsigc++-2.0-0v5
-    - liburcu8
+    - liburcu8t64
     - libwacom9
     - libwayland-client0
     - libwayland-egl1
@@ -96,4 +98,4 @@ parts:
     - libxml++2.6-2v5
     - libxml2
     - libxrender1
-    - libyaml-cpp0.7
+    - libyaml-cpp0.8
diff --git a/spread.yaml b/spread.yaml
@@ -8,7 +8,7 @@ backends:
             - alpine-3.18
             - alpine-3.19
             - alpine-edge
-            - ubuntu-22.04
+            - ubuntu-24.04
             - fedora-39
             - fedora-40
             - fedora-rawhide:
@@ -20,10 +20,10 @@ environment:
     ARCH/ubuntu_armhf: armhf
     DISTRO: ubuntu
     DISTRO/debian_sid: debian
-    RELEASE: jammy
-    RELEASE/ubuntu: jammy
+    RELEASE: noble
+    RELEASE/ubuntu: noble
     RELEASE/ubuntu_mantic: mantic
-    RELEASE/ubuntu_devel: noble
+    RELEASE/ubuntu_devel: oracular
     RELEASE/debian_sid: sid
     PROPOSED: false
     PROPOSED/ubuntu_proposed: true

diff --git a/spread/build/sbuild/mir-team.asc b/spread/build/sbuild/mir-team.asc
@@ -1,12 +1,31 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Hostname:
+Version: Hockeypuck 2.1.1-10-gec3b0e7
 
-mI0EUTTcfQEEAL1AdDx4d0UR5720vdqftfPgWVIsQUCLjbcGbxxxL1tmzsMWOdhh
-isc3j0NBsLaSxnkFeqJ37vGPjVZTtg0f0r+5zmBvkikiRZbli5nm8HJLdMAqMhu4
-o+EQ1kO382ipu5UfICtVFcVxUI1h9uKgPGckneHUZLPxn/A+nK/dLwg/ABEBAAG0
-JkxhdW5jaHBhZCBQUEEgZm9yIE1pciBkZXZlbG9wbWVudCB0ZWFtiLgEEwECACIF
-AlE03H0CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEKxhm2pXJdNGdUcD
-/0f4JEQE69ChSYt+hossxsn8X5GwUtiRd/hWLFzd+k3PleiDhM2i2apnJ3H1C277
-5u/hJOcj94lXkWYiL8YR2ElYJUY/6Uxw97pPoooTQ6Bqytcu82c1E9V7gct0WODC
-xvr+E57ETonJ96N52ADOOLlgoEizggxB0HhgCITsR5sM
-=milS
+xsFNBGY0hU8BEAC3MqLoukuPATDmz3u/2QvxTedvRHnAjGFH0guy2eQnv5kbvXVq
+WS6V7953/wznMZHLEyJ8kclJnvFfJel7ePRMQSnI99+zqDSSNE/PirviRKT+uWH5
+MiOAOkDul80mExA0KG1275gUWO/35QOKKb4QADgi8Vgqf+zhp6km9ucylS24aUOy
+RtuBUO5bJ3tleRBOPwQwaW6ybkHvwDXnFcCMUuy/ddFqMYlKzTLR9gG+18If119u
+ZGzUy13Ps7ieZYavlELuYK8ZyRtnrNpyvyrGYhXZtBZwA0+3q+WmUxSiw3JSy/eL
+t+54tDFbPFwOVoLyRHIc/vuA9M3eV3kyojCqvKeuVI+1c80rn8ToI+8b3BOVzp60
+InIoSmXm5ShSj8rCeTURMeuNsCIeKvm93/Ojo0p53qb4lp4SBsbHlKKLQ9vuw+01
+yBtKEn+TZQgeEl/zVqwpVIRv7RsN8eiGsNj3QQB21qKWB/GSb82in2la+iA8faPp
+PXNxSDPTVqcw0zEyK+MI1j4RbnI0zAR+pV0oiRdKCm5Fig3BovYtuWndTCFrnvTq
+1H/QCma+yfWXegl1dMU86TA95iOVmKG89de2SAt2/sS7erfxKcAxYYrov3MXZlFL
+cu9+bVA2yV2Df3SD9tmcgO9ArmnmhjgAb54nLs+IiFnVoYhLGxmglI/4wwARAQAB
+zSZMYXVuY2hwYWQgUFBBIGZvciBNaXIgZGV2ZWxvcG1lbnQgdGVhbcLBjgQTAQoA
+OBYhBK4UzfYvXE2tkrbJA2Stpj3OkG7BBQJmNIVPAhsDBQsJCAcCBhUKCQgLAgQW
+AgMBAh4BAheAAAoJEGStpj3OkG7BIAgP+gPuM5KHoR0+vVaYa6Z+BfFbmbRM5CTv
+dtdzENKI7zfxptI3PRRG2tEtFdMB0lhm2x59RHZLTLndlWJk1KAxrDkCAUpbqYwu
+t2YHEYgtVzwH6McHsSnzmzagDEcdRXxRC8C4OlTa/Ee8gsjL9pO8Vdm7iWB16Vig
+Hz/R8aghzMjx59vRhtk5FF6xL7usohKdn7gOgOVv93mk2Gqz08G10U4rH0E6Ai7G
+/A0Wm+UJI48S+wdysnTQKIx1jEhD4JPWU0Iqw/eALokb+MdWKO/A0ep5ROBtwFkB
+6GsSPrz04H/B5lkBBfq2j+U6F3pRGSJobJjh53a6p2I5j6sp+iMNcn5+ls1mn0wc
+oXXfiF1IYEG8h5/zvP7TzUAFtEsua9/mR/S8AVGmn5rxK7t2CnltUc4p8ANTVsSu
+VKjFd0h+SLlb/Fjs8s8Kz2+Pbh4w5C8y1esS6vXqqhPgtGF9SHBamP3SB1DS9nMM
+cDEDWHcE5IMxbtBTAsUIZFxSqq422dlkBURMjWswDYiBiL5QuqrCeiEkX83Q4bG2
+/q8IJfCcFO0kBNZbEtmN7KPmPMNrn9iIguY6uqd1z6FBdldsg7oHL6hq6KsjQPum
+ulq0CZ3YSIzSt0R1fMGdFvUN+i2rzqU2n6hUTA++ds1WQn/KzjyDKxwUu/+db1TX
+nknxV1KqEEAQ
+=+tsi
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/spread/build/sbuild/task.yaml b/spread/build/sbuild/task.yaml
@@ -22,7 +22,8 @@ execute: |
         debootstrap \
         debhelper \
         dh-python \
-        lsb-invalid-mta \
+        fakeroot \
+        nullmailer \
         qemu-user-static \
         sbuild \
         schroot \
@@ -67,8 +68,6 @@ execute: |
     if [ "${DEB_BUILD_ARCH}" != "${DEB_HOST_ARCH}" ]; then
       MKSBUILD_OPTS+=("--arch=${DEB_BUILD_ARCH}" "--target=${DEB_HOST_ARCH}")
 
-      # Quirk for the eglexternalplatform-dev build dependency
-      sed -i '/:all,$/n; s/\(eglexternalplatform-dev\)/\1:all/' debian/control
       SCHROOT_NAME="${SCHROOT_NAME}-${DEB_HOST_ARCH}"
 
       if [[ ${DEB_HOST_ARCH} == armhf ]]; then

diff --git a/spread/build/ubuntu/task.yaml b/spread/build/ubuntu/task.yaml
@@ -68,7 +68,7 @@ execute: |
 
     # use clang
     if [ "${CLANG}" -eq 1 ]; then
-      apt-get install --yes --no-install-recommends clang
+      apt-get install --yes --no-install-recommends clang libclang-rt-dev
       echo "OVERRIDE_CONFIGURE_OPTIONS += -DCMAKE_C_COMPILER=clang" >> debian/opts.mk
       echo "OVERRIDE_CONFIGURE_OPTIONS += -DCMAKE_CXX_COMPILER=clang++" >> debian/opts.mk
       echo "OVERRIDE_CONFIGURE_OPTIONS += -DCMAKE_CXX_FLAGS=-fpch-validate-input-files-content" >> debian/opts.mk
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ jobs: @@
           fail-fast: true
           matrix:
             release:
-            - "22.04"
             - "23.10"
             - "24.04"
             - "devel"
@@ Expand Down @@