CICD: Improve the GitHub Actions for Linux.

Do a few things:
- add a build for Debian trixie (as discussed in #4182);
- add a build for Ubuntu 24.04;
- rename the build definitions to match the build names;
- update the artifact uploads to use a non-deprecated version of the
  action, and name the artifact appropriately;
- remove a stale workflow file.

Signed-off-by: Michael Keller <github@ike.ch>

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
     - name: get container ready for build
       run: |
         sudo apt-get update
-        sudo apt-get install -y -q --force-yes \
+        sudo apt-get install -y -q \
         autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
         libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
         libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \

.github/workflows/coverity-scan.yml

@@ -16,8 +16,8 @@ jobs:
     - name: add build dependencies
       run: |
         apt-get update
-        apt-get upgrade -y
+        apt-get dist-upgrade -y
-        DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes \
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
         wget curl \
         autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
         libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \

.github/workflows/linux-bionic-5.9.yml.disabled

@@ -1,55 +0,0 @@
-name: Ubuntu 18.04 / Qt 5.9--
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  buildOnBionic:
-    runs-on: ubuntu-18.04
-    container:
-      image: ubuntu:18.04 # yes, this looks redundant, but something is messed up with their Ubuntu image that causes our builds to fail
-
-    steps:
-    - name: checkout sources
-      uses: actions/checkout@v1
-
-    - name: add build dependencies
-      run: |
-        apt update
-        apt install -y \
-        autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
-        libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
-        libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
-        libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
-        pkg-config qml-module-qtlocation qml-module-qtpositioning \
-        qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
-        qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
-        qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
-        qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev
-
-    - name: store dummy version and build number for pull request
-      if: github.event_name == 'pull_request'
-      run: |
-        echo "6.0.100" > latest-subsurface-buildnumber
-
-    - name: build Subsurface
-      env:
-         SUBSURFACE_REPO_PATH: ${{ github.workspace }}
-      run: |
-        cd ..
-        git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
-        git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
-        bash -x subsurface/scripts/build.sh -desktop -build-with-webkit
-
-    - name: test desktop build
-      run: |
-        # and now run the tests - with Qt 5.9 we can only run the desktop flavor
-        echo "------------------------------------"
-        echo "run tests"
-        cd build/tests
-        # xvfb-run --auto-servernum ./TestGitStorage -v2
-        xvfb-run --auto-servernum make check

.github/workflows/linux-debian-trixie-5.15.yml

@@ -0,0 +1,102 @@
+name: Debian trixie / Qt 5.15--
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:trixie
+
+    steps:
+    - name: checkout sources
+      uses: actions/checkout@v1
+
+    - name: get container ready for build
+      env:
+         SUBSURFACE_REPO_PATH: ${{ github.workspace }}
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "update distro and install dependencies"
+
+        apt-get update
+        apt-get dist-upgrade -y
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
+        autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
+        libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
+        libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
+        libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
+        pkg-config qml-module-qtlocation qml-module-qtpositioning \
+        qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
+        qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
+        qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
+        qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev \
+        mdbtools-dev
+
+        git config --global user.email "ci@subsurface-divelog.org"
+        git config --global user.name "Subsurface CI"
+        git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
+        git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
+
+    - name: store dummy version and build number for test build
+      run: |
+        echo "100" > latest-subsurface-buildnumber
+        echo "CICD-test-build" > latest-subsurface-buildnumber-extension
+
+    - name: build subsurface-mobile
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building mobile"
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -mobile
+
+    - name: test mobile build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "running tests for mobile"
+
+        cd build-mobile/tests
+        # xvfb-run --auto-servernum ./TestGitStorage -v2
+        xvfb-run --auto-servernum make check
+
+    - name: build subsurface
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building desktop"
+
+        # now build for the desktop version (including WebKit)
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
+
+    - name: test desktop build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "running tests for desktop"
+        cd build/tests
+        # xvfb-run --auto-servernum ./TestGitStorage -v2
+        xvfb-run --auto-servernum make check
+
+    - name: build subsurface-downloader
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building downloader"
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -downloader
+
+    - name: build smtk2ssrf
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building smtk2ssrf"
+
+        # build smtk2ssrf (needs the artefacts generated by the subsurface build
+        cd ..
+        bash -e -x subsurface/scripts/smtk2ssrf-build.sh -y

.github/workflows/linux-fedora-35-qt6.yml

@@ -12,7 +12,7 @@ on:
     - master
 
 jobs:
-  buildFedoraQt6:
+  build:
     runs-on: ubuntu-latest
     container:
       image: fedora:35

.github/workflows/linux-snap.yml

@@ -48,7 +48,7 @@ jobs:
         /snap/bin/lxc profile device add default ccache disk source=${HOME}/.ccache/ path=/root/.ccache
 
         # Patch snapcraft.yaml to enable ccache
-        patch -p1 < .github/workflows/linux-snap.patch
+        patch -p1 < .github/workflows/scripts/linux-snap.patch
 
         # Find common base between master and HEAD to use as cache key.
         git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules origin master
@@ -73,7 +73,7 @@ jobs:
 
     - name: Upload the snap
       if: github.event_name == 'push'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.build-snap.outputs.snap-name }}
         path: ${{ steps.build-snap.outputs.snap-path }}

.github/workflows/linux-ubuntu-20.04-5.15.yml

@@ -12,7 +12,7 @@ on:
     - master
 
 jobs:
-  buildUbuntuFocal:
+  build:
     runs-on: ubuntu-latest
     container:
       image: ubuntu:20.04
@@ -27,8 +27,8 @@ jobs:
         echo "update distro and install dependencies"
 
         apt-get update
-        apt-get upgrade -y
+        apt-get dist-upgrade -y
-        DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes \
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
         autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
         libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
         libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \

.github/workflows/linux-ubuntu-22.04-5.15.yml

@@ -12,7 +12,7 @@ on:
     - master
 
 jobs:
-  buildUbuntuJammy:
+  build:
     runs-on: ubuntu-latest
     container:
       image: ubuntu:22.04
@@ -29,8 +29,8 @@ jobs:
         echo "update distro and install dependencies"
 
         apt-get update
-        apt-get upgrade -y
+        apt-get dist-upgrade -y
-        DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes \
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
         autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
         libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
         libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \

.github/workflows/linux-ubuntu-24.04-5.15.yml

@@ -0,0 +1,102 @@
+name: Ubuntu 24.04 / Qt 5.15--
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:24.04
+
+    steps:
+    - name: checkout sources
+      uses: actions/checkout@v1
+
+    - name: get container ready for build
+      env:
+         SUBSURFACE_REPO_PATH: ${{ github.workspace }}
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "update distro and install dependencies"
+
+        apt-get update
+        apt-get dist-upgrade -y
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
+        autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
+        libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
+        libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
+        libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
+        pkg-config qml-module-qtlocation qml-module-qtpositioning \
+        qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
+        qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
+        qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
+        qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev \
+        mdbtools-dev
+
+        git config --global user.email "ci@subsurface-divelog.org"
+        git config --global user.name "Subsurface CI"
+        git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
+        git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
+
+    - name: store dummy version and build number for test build
+      run: |
+        echo "100" > latest-subsurface-buildnumber
+        echo "CICD-test-build" > latest-subsurface-buildnumber-extension
+
+    - name: build subsurface-mobile
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building mobile"
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -mobile
+
+    - name: test mobile build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "running tests for mobile"
+
+        cd build-mobile/tests
+        # xvfb-run --auto-servernum ./TestGitStorage -v2
+        xvfb-run --auto-servernum make check
+
+    - name: build subsurface
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building desktop"
+
+        # now build for the desktop version (including WebKit)
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
+
+    - name: test desktop build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "running tests for desktop"
+        cd build/tests
+        # xvfb-run --auto-servernum ./TestGitStorage -v2
+        xvfb-run --auto-servernum make check
+
+    - name: build subsurface-downloader
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building downloader"
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -downloader
+
+    - name: build smtk2ssrf
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building smtk2ssrf"
+
+        # build smtk2ssrf (needs the artefacts generated by the subsurface build
+        cd ..
+        bash -e -x subsurface/scripts/smtk2ssrf-build.sh -y

.github/workflows/mac.yml

@@ -12,7 +12,7 @@ on:
     - master
 
 jobs:
-  buildMac:
+  build:
     runs-on: macOS-11
     steps:
     - name: checkout sources

README.md

@@ -7,8 +7,9 @@
 
 [![Snap](https://github.com/subsurface/subsurface/actions/workflows/linux-snap.yml/badge.svg)](https://github.com/subsurface/subsurface/actions/workflows/linux-snap.yml)
 [![Ubuntu 14.04 / Qt 5.12 for AppImage--](https://github.com/subsurface/subsurface/actions/workflows/linux-trusty-5.12.yml/badge.svg)](https://github.com/subsurface/subsurface/actions/workflows/linux-trusty-5.12.yml)
-[![Ubuntu 22.04 / Qt 5.15--](https://github.com/subsurface/subsurface/actions/workflows/linux-jammy-5.15.yml/badge.svg)](https://github.com/subsurface/subsurface/actions/workflows/linux-jammy-5.15.yml)
+[![Ubuntu 24.04 / Qt 5.15--](https://github.com/subsurface/subsurface/actions/workflows/linux-ubuntu-24.04-5.15.yml/badge.svg)](https://github.com/subsurface/subsurface/actions/workflows/linux-ubuntu-24.04-5.15.yml)
-[![Fedora 35 / Qt 6--](https://github.com/subsurface/subsurface/actions/workflows/linux-fedora-qt6.yml/badge.svg)](https://github.com/subsurface/subsurface/actions/workflows/linux-fedora-qt6.yml)
+[![Fedora 35 / Qt 6--](https://github.com/subsurface/subsurface/actions/workflows/linux-fedora-35-qt6.yml/badge.svg)](https://github.com/subsurface/subsurface/actions/workflows/linux-fedora-35-qt6.yml)
+[![Debian trixie / Qt 5.15--](https://github.com/subsurface/subsurface/actions/workflows/linux-debian-trixie-5.15.yml/badge.svg)](https://github.com/subsurface/subsurface/actions/workflows/linux-debian-trixie-5.15.yml)
 
 [![Coverity Scan Results](https://scan.coverity.com/projects/14405/badge.svg)](https://scan.coverity.com/projects/subsurface-divelog-subsurface)
 

packaging/headless/HOWTO

@@ -18,7 +18,7 @@ trac system.
 * Connected network cable from Laptop (enabled Internet sharing in System Preferences)
 * ifconfig suggests RPi got IP address 192.168.2.2
 * logged in as user pi and pw raspberry
-* sudo apt-get update and upgrade
+* sudo apt-get update and dist-upgrade
 * no space left on device. Hmm. Trying to reboot
 * ah running sudo rasps-config allows to extend the file system
 * sudo dpkg-reconfigure tzdata

scripts/docker/android-build-container/Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:22.04 as base
 
 RUN apt-get update  && \
-    apt-get upgrade -y && \
+    apt-get dist-upgrade -y && \
     apt-get install -y \
     unzip \
     git \

scripts/docker/mxe-build-container/Dockerfile

@@ -5,7 +5,7 @@ FROM ubuntu:22.04 as base
 
 # update and set up the packages we need for the build
 RUN apt-get update  &&  \
-    apt-get upgrade -y && \
+    apt-get dist-upgrade -y && \
     apt-get install -y \
     autoconf \
     automake \