Skip to content

Commit dcfc94b

Browse files
authored
Merge pull request #178 from atsju/JST/buildProcess
Tested the windows build from #178 and it works fine so approved and merged.
2 parents 36cebb5 + aa7e26d commit dcfc94b

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.github/workflows/build-linux-clazy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ on:
99

1010
jobs:
1111
build-linux-clazy:
12-
runs-on: ubuntu-22.04
12+
# This build is only done on one Linux version as it is here only to get the warnings from clazy.
13+
# For other versions see build-linux.yml
14+
runs-on: ubuntu-latest
1315
steps:
1416
- uses: actions/checkout@v4
1517
- run: sudo apt update
16-
- 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
18+
- 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
1719
- run: qmake -spec linux-clang QMAKE_CXX="clazy"
1820
#- uses: ammaraskar/gcc-problem-matcher@master #TODO 2023/08/05 re-enable problem matcher when all warnings are fixed
1921
# ignore noisy dirs from QT files itself

.github/workflows/build-linux.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ on:
99

1010
jobs:
1111
build-linux:
12-
runs-on: ubuntu-22.04
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
os: [ubuntu-24.04, ubuntu-22.04]
16+
runs-on: ${{ matrix.os }}
1317
steps:
1418
- uses: actions/checkout@v4
1519
- run: sudo apt update
16-
- 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
20+
- 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
1721
- run: qmake
1822
- uses: ammaraskar/gcc-problem-matcher@master
1923
- run: echo "::add-matcher::.github/matcher/uic_matcher.json"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Additional information and help is availlable at https://groups.io/g/Interferome
3535

3636
```
3737
sudo apt update
38-
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
38+
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
3939
qmake
4040
make -j4
4141
```

0 commit comments

Comments
 (0)