Skip to content

Commit e49bb07

Browse files
committed
Update builds to generate packages instead of executables
1 parent d09eaf4 commit e49bb07

File tree

2 files changed

+49
-11
lines changed

2 files changed

+49
-11
lines changed

.github/workflows/build.yml

Lines changed: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@ jobs:
1414
- name: Compile
1515
run: |
1616
mkdir build
17-
cmake -S . -B build -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DCAN_DRIVER=None -DCMAKE_BUILD_TYPE=Debug
18-
cmake --build build --config Debug
17+
cmake -S . -B build -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -Wno-dev
18+
cmake --build build --config Release --target package
19+
- name: 'Upload Windows Installer'
20+
uses: actions/upload-artifact@v3
21+
with:
22+
name: 'Windows Installer'
23+
path: build/_CPack_Packages/win64/NSIS/*.exe
1924
mac_build:
2025
name: MacOS Build
2126
runs-on: macos-latest
@@ -27,12 +32,16 @@ jobs:
2732
- name: Compile
2833
run: |
2934
mkdir build
30-
cmake -S . -B build -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DCAN_DRIVER=None -DCMAKE_BUILD_TYPE=Debug
31-
cmake --build build --config Debug
32-
33-
ubuntu_build:
34-
name: Ubuntu Build
35-
runs-on: ubuntu-latest
35+
cmake -S . -B build -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -Wno-dev
36+
cmake --build build --config Release --target package
37+
- name: 'Upload OSX Installer'
38+
uses: actions/upload-artifact@v3
39+
with:
40+
name: 'OSX dmg package'
41+
path: build/_CPack_Packages/OSX/DragNDrop/*.dmg
42+
ubuntu_20_04_build:
43+
name: Ubuntu 20.04 Build
44+
runs-on: ubuntu-20.04
3645
steps:
3746
- name: Checkout
3847
uses: actions/checkout@v3
@@ -42,6 +51,35 @@ jobs:
4251
run: |
4352
mkdir build
4453
sudo apt install libasound2-dev libjack-jackd2-dev ladspa-sdk libcurl4-openssl-dev libfreetype6-dev libx11-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev mesa-common-dev
45-
cmake -S . -B build -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DCAN_DRIVER=None -DCMAKE_BUILD_TYPE=Debug
46-
cmake --build build --config Debug
54+
cmake -S . -B build -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -Wno-dev
55+
cmake --build build --config Release
56+
cd build
57+
cpack -G DEB
58+
- name: 'Upload Ubuntu 20.04 deb package'
59+
uses: actions/upload-artifact@v3
60+
with:
61+
name: 'Ubuntu 20.04 deb package'
62+
path: build/_CPack_Packages/Linux/DEB/*.deb
63+
ubuntu_22_04_build:
64+
name: Ubuntu 22.04 Build
65+
runs-on: ubuntu-22.04
66+
steps:
67+
- name: Checkout
68+
uses: actions/checkout@v3
69+
with:
70+
submodules: recursive
71+
- name: Compile
72+
run: |
73+
mkdir build
74+
sudo apt install libasound2-dev libjack-jackd2-dev ladspa-sdk libcurl4-openssl-dev libfreetype6-dev libx11-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev mesa-common-dev
75+
cmake -S . -B build -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -Wno-dev
76+
cmake --build build --config Release
77+
cd build
78+
cpack -G DEB
79+
- name: 'Upload Ubuntu 22.04 deb package'
80+
uses: actions/upload-artifact@v3
81+
with:
82+
name: 'Ubuntu 22.04 deb package'
83+
path: build/_CPack_Packages/Linux/DEB/*.deb
84+
4785

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ set(CPACK_ALL_INSTALL_TYPES Full)
151151
set(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Full)
152152
set(CPACK_COMPONENT_APPLICATIONS_INSTALL_TYPES Full)
153153
set(CPACK_NSIS_INSTALLED_ICON_NAME ${CMAKE_CURRENT_LIST_DIR}/doc/smallLogo.ico)
154-
set(CPACK_PACKAGE_ICON ${CPACK_NSIS_INSTALLED_ICON_NAME})
155154
set(CPACK_NSIS_CONTACT ${CPACK_PACKAGE_CONTACT})
156155
set(CPACK_NSIS_MUI_ICON ${CPACK_NSIS_INSTALLED_ICON_NAME})
157156
set(CPACK_NSIS_MUI_UNICON ${CPACK_NSIS_INSTALLED_ICON_NAME})
@@ -167,6 +166,7 @@ if(APPLE)
167166
set(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME}")
168167
set(CPACK_SYSTEM_NAME "OSX")
169168
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
169+
set(CPACK_PACKAGE_ICON ${CPACK_NSIS_INSTALLED_ICON_NAME})
170170
endif()
171171

172172
# Must be after the last CPACK macros

0 commit comments

Comments
 (0)