From 77f726d4b5d4bada94738a4a8fda3737939258e8 Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Mon, 17 Feb 2025 14:16:58 +0100 Subject: [PATCH 1/4] update dependencies --- .github/workflows/build-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 276e8fd6..3db4b6d2 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -9,11 +9,11 @@ on: jobs: build-linux: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - run: sudo apt update - - run: sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-core4.5d libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libarmadillo10 + - run: sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev - run: qmake - uses: ammaraskar/gcc-problem-matcher@master - run: echo "::add-matcher::.github/matcher/uic_matcher.json" From 5d175ef3e2fcd4215279b841afe98b078d098c5a Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Mon, 17 Feb 2025 14:34:36 +0100 Subject: [PATCH 2/4] build on all linux versions with matrix strategy --- .github/workflows/build-linux-clazy.yml | 6 ++++-- .github/workflows/build-linux.yml | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-linux-clazy.yml b/.github/workflows/build-linux-clazy.yml index 3d3a2282..b42fec41 100644 --- a/.github/workflows/build-linux-clazy.yml +++ b/.github/workflows/build-linux-clazy.yml @@ -9,11 +9,13 @@ on: jobs: build-linux-clazy: - runs-on: ubuntu-22.04 + # This build is only done on one Linux version as it is here only to get the warnings from clazy. + # For other versions see build-linux.yml + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - run: sudo apt update - - run: sudo apt install -y clazy apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-core4.5d libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libarmadillo10 + - run: sudo apt install -y clazy apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev - run: qmake -spec linux-clang QMAKE_CXX="clazy" #- uses: ammaraskar/gcc-problem-matcher@master #TODO 2023/08/05 re-enable problem matcher when all warnings are fixed # ignore noisy dirs from QT files itself diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 3db4b6d2..7e44eed5 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -9,7 +9,11 @@ on: jobs: build-linux: - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - run: sudo apt update From bb830629c57455493d8739efb5a5759279a64554 Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Mon, 17 Feb 2025 14:41:18 +0100 Subject: [PATCH 3/4] don't build on ubuntu 20.4 as it fails and is old enough to drop support --- .github/workflows/build-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 7e44eed5..6539a3a3 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04] + os: [ubuntu-24.04, ubuntu-22.04] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From aa7e26df04c721eb4360bbf79d79ad480230b68c Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Mon, 17 Feb 2025 14:44:28 +0100 Subject: [PATCH 4/4] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 981862c0..5a175b72 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Additional information and help is availlable at https://groups.io/g/Interferome ``` sudo apt update -sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-core4.5d libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libarmadillo10 +sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev qmake make -j4 ```