Skip to content

Commit 1da9e78

Browse files
committed
successful test for qwt build on linux, qtac should work too
1 parent c5e488c commit 1da9e78

File tree

1 file changed

+3
-34
lines changed

1 file changed

+3
-34
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-22.04, ubuntu-latest]
11-
qt_version: ['6.8.3', '6.9.2']
11+
qt_version: ['6.9.2', '6.10.0']
1212
build_type: [Debug, Release]
13-
qwt_version: ['6.3.0']
1413

1514
steps:
1615
- uses: actions/checkout@v4
@@ -38,16 +37,6 @@ jobs:
3837
path: ${{ env.QT_ROOT_DIR }}
3938
key: ${{ runner.os }}-qt-${{ matrix.qt_version }}
4039

41-
- name: Download and build Qwt ${{ matrix.qwt_version }} from source
42-
run: |
43-
set -e -x
44-
wget https://sourceforge.net/projects/qwt/files/qwt/${{ matrix.qwt_version }}/qwt-${{ matrix.qwt_version }}.tar.bz2
45-
tar -xjf qwt-${{ matrix.qwt_version }}.tar.bz2
46-
cd qwt-${{ matrix.qwt_version }}
47-
"${QT_ROOT_DIR}/bin/qmake" qwt.pro qwt.pro
48-
make -j$(nproc)
49-
sudo make install
50-
5140
- name: Configure CMake for ${{ matrix.build_type }}
5241
run: |
5342
mkdir build
@@ -61,9 +50,8 @@ jobs:
6150
runs-on: windows-2022
6251
strategy:
6352
matrix:
64-
qt_version: ['6.8.3', '6.9.2']
53+
qt_version: ['6.9.2', '6.10.0']
6554
build_type: [Debug, Release]
66-
qwt_version: ['6.3.0']
6755

6856
steps:
6957
- uses: actions/checkout@v4
@@ -89,31 +77,12 @@ jobs:
8977
path: ${{ env.QT_ROOT_DIR }}
9078
key: ${{ runner.os }}-qt-${{ matrix.qt_version }}
9179

92-
- name: Download and build Qwt ${{ matrix.qwt_version }} from source
93-
shell: pwsh
94-
run: |
95-
choco install 7zip -y
96-
97-
$qwtZipUrl = "https://cyfuture.dl.sourceforge.net/project/qwt/qwt/${{ matrix.qwt_version }}/qwt-${{ matrix.qwt_version }}.zip?viasf=1"
98-
$qwtZipPath = "$env:TEMP\qwt.zip"
99-
Invoke-WebRequest $qwtZipUrl -OutFile $qwtZipPath
100-
101-
7z x $qwtZipPath -o"$env:TEMP\qwt"
102-
cd "$env:TEMP\qwt\qwt-${{ matrix.qwt_version }}"
103-
qmake qwt.pro
104-
msbuild qwt.sln /p:Configuration=Release
105-
106-
# Install to C:\qwt
107-
mkdir C:\qwt
108-
xcopy /s /i lib C:\qwt\lib
109-
xcopy /s /i include C:\qwt\include
110-
11180
- name: Configure CMake for ${{ matrix.build_type }}
11281
shell: pwsh
11382
run: |
11483
mkdir build
11584
cd build
116-
cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_PREFIX_PATH="C:\qwt"
85+
cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}"
11786
11887
- name: Build with ${{ matrix.build_type }}
11988
shell: pwsh

0 commit comments

Comments
 (0)