Skip to content

Commit cfa6980

Browse files
committed
Merge branch 'dev_qt6'
2 parents e0ccb75 + 8eb7f52 commit cfa6980

File tree

118 files changed

+1859
-7354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1859
-7354
lines changed

.github/workflows/build-linux.yml

Lines changed: 0 additions & 100 deletions
This file was deleted.

.github/workflows/build-windows.yml

Lines changed: 0 additions & 102 deletions
This file was deleted.
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Example Tests
2+
3+
on:
4+
push:
5+
branches: [main, master]
6+
pull_request:
7+
branches: [main, master]
8+
9+
jobs:
10+
example-tests:
11+
runs-on: ubuntu-22.04
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Install Qt6 and dependencies
16+
run: |
17+
sudo apt-get update
18+
sudo apt-get install -y \
19+
cmake \
20+
ninja-build \
21+
libgsl-dev \
22+
qt6-base-dev \
23+
qt6-svg-dev \
24+
qt6-tools-dev \
25+
libgl1-mesa-dev \
26+
python3
27+
28+
- name: Cache Qwt-Qt6
29+
id: cache-qwt
30+
uses: actions/cache@v4
31+
with:
32+
path: ~/qwt-qt6-install
33+
key: ${{ runner.os }}-qwt-qt6-6.3.0
34+
35+
- name: Build Qwt-Qt6
36+
if: steps.cache-qwt.outputs.cache-hit != 'true'
37+
run: |
38+
cd ~
39+
wget https://downloads.sourceforge.net/project/qwt/qwt/6.3.0/qwt-6.3.0.tar.bz2
40+
tar xjf qwt-6.3.0.tar.bz2
41+
cd qwt-6.3.0
42+
sed -i 's|^QWT_INSTALL_PREFIX.*|QWT_INSTALL_PREFIX = $${HOME}/qwt-qt6-install|' qwtconfig.pri
43+
/usr/lib/qt6/bin/qmake qwt.pro
44+
make -j$(nproc)
45+
make install
46+
47+
- name: Build Strata
48+
run: |
49+
mkdir build && cd build
50+
cmake .. \
51+
-GNinja \
52+
-DCMAKE_BUILD_TYPE=Release \
53+
-DQWT_INCLUDE_DIR="$HOME/qwt-qt6-install/include" \
54+
-DQWT_LIBRARY="$HOME/qwt-qt6-install/lib/libqwt.so"
55+
cmake --build . --parallel
56+
57+
- name: Run example tests
58+
run: |
59+
python3 scripts/compare_examples.py \
60+
build/source/strata \
61+
example/

0 commit comments

Comments
 (0)