update builds to work on ubuntu 20 & 22

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9e2b3a2e36cd4fa443fcdbd3425f476d79b12c70..ab79291ab4b3447cdec0bb0a8cfcaccb367481e6 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
           cmake --build . -j $(nproc)
 
   build-ubuntu-20:
-    name: "Ubuntu 20.04 (Default Qt 5.12)"
+    name: "Ubuntu 20.04 (Qt 5.12 + Latest CMake)"
     runs-on: ubuntu-latest
     container:
       image: ubuntu:20.04
@@ -72,10 +72,20 @@ jobs:
         run: apt update
       - name: install dependencies
         run: |
+          # 1. Install tools to add external repos
+          apt -y install wget gpg software-properties-common
+
+          # 2. Add Kitware repository (for modern CMake > 3.20)
+          wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+          echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+          apt update
+
+          # 3. Install dependencies (Now installs latest CMake)
           apt -y install git cmake build-essential ccache libssl-dev libunbound-dev \
           libboost-all-dev libqrencode-dev qtbase5-dev libqt5svg5-dev libqt5websockets5-dev \
           qtmultimedia5-dev libzip-dev libsodium-dev libgcrypt20-dev libx11-xcb-dev \
           protobuf-compiler libprotobuf-dev libhidapi-dev libusb-dev libusb-1.0-0-dev
+
       - name: configure git
         run: git config --global --add safe.directory '*'
       - uses: actions/checkout@v4
@@ -85,6 +95,7 @@ jobs:
         run: |
           mkdir build
           cd build
+          # The script will now auto-detect that Qt6 is missing and use Qt5
           cmake -DWITH_SCANNER=OFF ..
           cmake --build . -j $(nproc)
 

diff --git a/.github/workflows/guix.yml b/.github/workflows/guix.yml
index abd058f0820fffc65599dabe3e813f227262124f..90dd25792dafda6097785beba3c830d3a6c7330e 100644 (file)
--- a/.github/workflows/guix.yml
+++ b/.github/workflows/guix.yml
@@ -74,7 +74,7 @@ jobs:
           EOF
           sudo /etc/init.d/apparmor reload
           sudo aa-enforce guix || true
-          sudo apt purge apparmor
+          sudo apt -y purge apparmor
       - name: build
         run: ADDITIONAL_GUIX_TIMEMACHINE_FLAGS="--disable-authentication" SUBSTITUTE_URLS='http://bordeaux.guix.gnu.org' HOSTS="${{ matrix.toolchain.target }}" ./contrib/guix/guix-build
       - name: virustotal scan