@@ -21,40 +21,31 @@ jobs:
21
21
fail-fast : false
22
22
matrix :
23
23
# https://github.com/actions/virtual-environments#available-environments
24
- os : [ubuntu-20.04, windows-latest, macos-latest]
24
+ os : [ubuntu-latest, windows-latest, macos-latest]
25
+ qt : ['6.2.4']
25
26
include :
26
- - os : ubuntu-20.04 # Oldest LTS for appimage support
27
- qt : ' 6.2.4' # Qt6 LTS
28
- qt_modules : ' qtmultimedia'
27
+ - os : ubuntu-latest
28
+ qt_modules : ' qtmultimedia qtcharts'
29
29
dependencies : |
30
- sudo apt-get install mesa-common-dev libgl1-mesa-dev libpcap-dev libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libxkbcommon-x11-0 -y
31
- installer_setup : |
32
- sudo gem install --no-document fpm
33
- make_cmd : make
30
+ sudo apt-get install mesa-common-dev libgl1-mesa-dev libpcap-dev libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libxkbcommon-x11-0 libfuse2 -y
34
31
artifact : |
35
- install/linux/sACNView*.AppImage
36
- install/linux/*.deb
32
+ out/build/sacnview*.deb
33
+ out/build/sACNView*.AppImage
37
34
38
35
- os : windows-latest
39
- qt : ' 6.2.4' # Qt6 LTS
40
- qt_modules : ' qtmultimedia'
41
- installer_setup : |
42
- Invoke-WebRequest -Uri "https://nsis.sourceforge.io/mediawiki/images/e/e0/NSIS_Simple_Firewall_Plugin_Unicode_1.21.zip" -OutFile "NSIS_Simple_Firewall_Plugin_Unicode.zip"
43
- 7z e NSIS_Simple_Firewall_Plugin_Unicode.zip -o"C:\Program Files (x86)\NSIS\Plugins\x86-unicode"
44
- arch : win64_msvc2019
45
- make_cmd : nmake
36
+ qt_modules : ' qtmultimedia qtcharts'
37
+ dependencies : |
38
+ choco install -y winflexbison3
39
+ arch : amd64
46
40
artifact : |
47
- install/win64 /sACNView*.exe
48
- release/ *.pdb
41
+ out/build /sACNView*.exe
42
+ out/build/src/Release/sACNView *.pdb
49
43
50
44
- os : macos-latest
51
- qt : ' 6.2.4' # Qt6 LTS
52
- qt_modules : ' qtmultimedia'
53
- installer_setup : |
54
- brew install create-dmg
45
+ qt_modules : ' qtmultimedia qtcharts'
55
46
xcode : latest-stable
56
- make_cmd : make
57
- artifact : install/mac/ sACNView*.dmg
47
+ artifact :
48
+ out/build/src/ sACNView
58
49
59
50
steps :
60
51
- name : Checkout
@@ -71,33 +62,37 @@ jobs:
71
62
aqtversion : ' ==2.0.0'
72
63
73
64
- name : Dependencies
74
- run : ${{ matrix.dependencies }}
75
-
76
- - name : Setup Installer
77
- run : ${{ matrix.installer_setup }}
65
+ run : ${{ matrix.dependencies }}
78
66
79
67
- name : Environment Setup (MSVC)
80
68
if : runner.os == 'Windows'
81
69
uses : ilammy/msvc-dev-cmd@v1
70
+ with :
71
+ arch : ${{ matrix.arch }}
82
72
83
73
- name : Environment Setup (Xcode)
84
74
if : runner.os == 'macOS'
85
75
uses : maxim-lobanov/setup-xcode@v1
86
76
with :
87
77
xcode-version : ${{ matrix.xcode }}
88
78
89
- - name : Run qmake
79
+ - name : Configure Build (MSVC)
80
+ if : runner.os == 'Windows'
90
81
shell : bash
91
82
run : |
92
- if [[ -n "${Qt5_DIR}" ]]; then export QTDIR=${Qt5_DIR}; fi
93
- if [[ -n "${Qt6_DIR}" ]]; then export QTDIR=${Qt6_DIR}; fi
94
- qmake sACNView.pro
83
+ if [[ -n "${Qt6_DIR}" ]]; then export CMAKE_PREFIX_PATH=${Qt6_DIR}; fi
84
+ cmake --preset windows-x64-release
95
85
96
- - name : Run make
97
- run : ${{ matrix.make_cmd }}
86
+ - name : Build (MSVC)
87
+ if : runner.os == 'Windows'
88
+ run : cmake --build --preset windows-release
89
+
90
+ - name : Pack (Windows)
91
+ if : runner.os == 'Windows'
92
+ run : cpack --preset windows-installer
98
93
99
94
- name : Upload Artifact(s)
100
95
uses : actions/upload-artifact@v3
101
96
with :
102
97
name : ${{ runner.os }}
103
- path : ${{ matrix.artifact }}
98
+ path : ${{ matrix.artifact }}
0 commit comments