File tree Expand file tree Collapse file tree 3 files changed +31
-13
lines changed Expand file tree Collapse file tree 3 files changed +31
-13
lines changed Original file line number Diff line number Diff line change 12
12
runs-on : ${{ matrix.os }}
13
13
strategy :
14
14
matrix :
15
- os : [ubuntu-18 .04, ubuntu-latest ]
15
+ os : [ubuntu-20 .04]
16
16
17
17
steps :
18
18
- name : Checkout
@@ -24,11 +24,14 @@ jobs:
24
24
- name : Install Qt
25
25
uses : jurplel/install-qt-action@v3
26
26
with :
27
- version : 5.14 .2
27
+ version : 5.15 .2
28
28
target : desktop
29
29
host : linux
30
30
install-deps : true
31
31
32
32
- name : Build
33
- run : ./build.sh -DQt5_PATH="${Qt5_Dir}" -j3
33
+ run : |
34
+ ./build.sh \
35
+ -DQt5_PATH="${Qt5_Dir}" \
36
+ -j3
34
37
continue-on-error : true
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ concurrency:
9
9
jobs :
10
10
mac-build-gui :
11
11
12
- runs-on : macOS-latest
12
+ runs-on : macos-10.15
13
13
14
14
steps :
15
15
- name : Checkout
@@ -18,17 +18,19 @@ jobs:
18
18
- name : Install Qt
19
19
uses : jurplel/install-qt-action@v3
20
20
with :
21
- version : 5.14 .2
21
+ version : 5.15 .2
22
22
target : desktop
23
23
host : mac
24
24
install-deps : true
25
25
26
- - name : Prepare
27
- run : |
28
- ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
26
+ # - name: Prepare
27
+ # run: |
28
+ # ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
29
29
30
30
- name : make
31
- run : ./build.sh -DQt5_PATH="${Qt5_Dir}"
31
+ run : |
32
+ ./build.sh \
33
+ -DQt5_PATH="${Qt5_Dir}"
32
34
33
35
- name : Package
34
36
working-directory : bin/Seg3D
Original file line number Diff line number Diff line change 11
11
windows-build-gui :
12
12
strategy :
13
13
matrix :
14
- qtversion : [5.12.8, 5.14.2]
15
- runs-on : windows-2016
14
+ qtversion : [5.15.2]
15
+ include :
16
+ - qtversion : 5.15.2
17
+ qtarch : win64_msvc2019_64
18
+ cmake-generator : " Visual Studio 17 2022"
19
+ cmake-arch : x64
20
+ cmake-toolset : v143
21
+ runs-on : windows-2022
16
22
17
23
steps :
18
24
@@ -25,13 +31,20 @@ jobs:
25
31
version : ${{ matrix.qtversion }}
26
32
target : desktop
27
33
host : windows
28
- arch : win64_msvc2017_64
34
+ arch : ${{ matrix.qtarch }}
29
35
install-deps : true
30
36
31
37
- name : Configure
32
38
working-directory : bin
33
39
run : |
34
- cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 15 2017" -Ax64 -DQt5_PATH:PATH="$env:Qt5_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF
40
+ cmake `
41
+ ..\Superbuild `
42
+ -DCMAKE_BUILD_TYPE=Release `
43
+ -G"${{ matrix.cmake-generator }}" `
44
+ -A${{ matrix.cmake-arch }} `
45
+ -T${{ matrix.cmake-toolset }} `
46
+ -DQt5_PATH:PATH="$env:Qt5_Dir" `
47
+ -DBUILD_WITH_PYTHON:BOOL=OFF
35
48
36
49
- name : Compile
37
50
working-directory : bin
You can’t perform that action at this time.
0 commit comments