back to basics?

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e6aeaf17453830932bfe18cf5927eac87a218fd0..1b2427fc963d7b936148a762b767a826cd8d2b59 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -3,7 +3,8 @@ name: Linux CI
 on:
   push:
     tags:
-      - "linux-*"
+      - "linux-2.8.1-*"
+      - "ubuntu-2.8.1-*"
 
 jobs:
   build:
@@ -12,14 +13,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [ubuntu-24.04, fedora-latest, archlinux-latest]
+        distro: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, fedora-latest, archlinux-latest]
         include:
           - distro: ubuntu-24.04
             container: ubuntu:24.04
             install_cmd: |
               export DEBIAN_FRONTEND=noninteractive
               apt update
-              apt -y install git cmake build-essential ccache libssl-dev libunbound-dev libboost-all-dev \
+              apt -y install git cmake build-essential ccache ninja-build libssl-dev libunbound-dev libboost-all-dev \
+                             libqrencode-dev qt6-base-dev qt6-svg-dev qt6-websockets-dev qt6-multimedia-dev \
+                             qt6-wayland-dev libzip-dev libsodium-dev libgcrypt20-dev libx11-xcb-dev \
+                             protobuf-compiler libprotobuf-dev libhidapi-dev libzxing-dev libusb-dev \
+                             libusb-1.0-0-dev pkg-config
+          - distro: ubuntu-22.04
+            container: ubuntu:22.04
+            install_cmd: |
+              export DEBIAN_FRONTEND=noninteractive
+              apt update
+              apt -y install git cmake build-essential ccache ninja-build libssl-dev libunbound-dev libboost-all-dev \
+                             libqrencode-dev qt6-base-dev qt6-svg-dev qt6-websockets-dev qt6-multimedia-dev \
+                             qt6-wayland-dev libzip-dev libsodium-dev libgcrypt20-dev libx11-xcb-dev \
+                             protobuf-compiler libprotobuf-dev libhidapi-dev libzxing-dev libusb-dev \
+                             libusb-1.0-0-dev pkg-config
+          - distro: ubuntu-20.04
+            container: ubuntu:20.04
+            install_cmd: |
+              export DEBIAN_FRONTEND=noninteractive
+              apt update
+              apt -y install software-properties-common
+              add-apt-repository -y ppa:okirby/qt6-backports
+              apt update
+              apt -y install git cmake build-essential ccache ninja-build libssl-dev libunbound-dev libboost-all-dev \
                              libqrencode-dev qt6-base-dev qt6-svg-dev qt6-websockets-dev qt6-multimedia-dev \
                              qt6-wayland-dev libzip-dev libsodium-dev libgcrypt20-dev libx11-xcb-dev \
                              protobuf-compiler libprotobuf-dev libhidapi-dev libzxing-dev libusb-dev \
@@ -28,7 +52,7 @@ jobs:
             container: fedora:latest
             install_cmd: |
               dnf -y update
-              dnf -y install git cmake make gcc-c++ ccache openssl-devel libunbound-devel boost-devel \
+              dnf -y install git cmake make gcc-c++ ccache ninja-build openssl-devel libunbound-devel boost-devel \
                              qrencode-devel qt6-qtbase-devel qt6-qtsvg-devel qt6-qtwebsockets-devel \
                              qt6-qtmultimedia-devel qt6-qtwayland-devel libzip-devel libsodium-devel \
                              libgcrypt-devel libxcb-devel protobuf-compiler protobuf-devel hidapi-devel \
@@ -37,7 +61,7 @@ jobs:
             container: archlinux:latest
             install_cmd: |
               pacman -Syu --noconfirm
-              pacman -S --noconfirm git cmake base-devel ccache openssl libunbound boost qrencode \
+              pacman -S --noconfirm git cmake base-devel ccache ninja openssl libunbound boost qrencode \
                                     qt6-base qt6-svg qt6-websockets qt6-multimedia qt6-wayland \
                                     libzip libsodium libgcrypt libxcb protobuf hidapi zxing-cpp libusb
 
@@ -65,10 +89,10 @@ jobs:
             ${{ matrix.distro }}-ccache-
 
       - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        run: cmake -G Ninja -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
       - name: Build
-        run: cmake --build build -j $(nproc)
+        run: cmake --build build
 
       - name: Validate Version
         run: ./build/bin/feather --version

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 2576306a3d1c478c72d66081bd38ef010a422072..4059879f3b4965b42803c911e0857ae9d712eaf2 100644 (file)
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -12,6 +12,7 @@ jobs:
     steps:
     env:
       CCACHE_DIR: /Users/runner/Library/Caches/ccache
+      HOMEBREW_NO_AUTO_UPDATE: 1
 
     steps:
       - name: Checkout repository
@@ -21,8 +22,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew update
-          brew install --quiet qt libsodium libzip qrencode unbound cmake boost hidapi openssl expat protobuf pkg-config ccache
+          brew install --quiet qt libsodium libzip qrencode unbound cmake boost hidapi openssl expat protobuf pkg-config ccache ninja
 
       - name: Setup ccache
         uses: actions/cache@v4
@@ -33,10 +33,10 @@ jobs:
             macos-ccache-
 
       - name: Configure CMake
-        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_SCANNER=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        run: cmake -G Ninja -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_SCANNER=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
       - name: Build
-        run: cmake --build build -j $(sysctl -n hw.ncpu)
+        run: cmake --build build
 
       - name: Validate Version
         run: ./build/bin/feather.app/Contents/MacOS/feather --version

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 61bad463f9a35cca366b5946c668c5ba08bd16c5..020f5ed7dcda429dad38d5a6efd2fdc9f4f8ae4d 100644 (file)
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -42,6 +42,7 @@ jobs:
             mingw-w64-x86_64-qt6-multimedia
             mingw-w64-x86_64-zxing-cpp
             mingw-w64-x86_64-ccache
+            mingw-w64-x86_64-ninja
 
       - name: Setup ccache
         uses: actions/cache@v4
@@ -54,8 +55,8 @@ jobs:
       - name: Build
         shell: msys2 {0}
         run: |
-          cmake -G "MinGW Makefiles" -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_SCANNER=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          cmake --build build -j $(nproc)
+          cmake -G Ninja -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_SCANNER=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake --build build
 
       - name: Validate Version
         shell: msys2 {0}