Skip to content

Commit 20c27e8

Browse files
committed
Update CI build to Ubuntu 24.04
1 parent c6ce9ae commit 20c27e8

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

.github/workflows/cmake_build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@ env:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212

1313
steps:
1414
- name: Install prerequisites
1515
run: |
1616
sudo apt-get update -y -qq
17-
sudo apt-get install -y -qq 'libqt5*-dev' qttools5-dev libswscale-dev ffmpeg libavcodec-dev libopencv-dev libaravis-dev
17+
sudo apt-get install -y -qq \
18+
'libqt5*-dev' qttools5-dev \
19+
libswscale-dev ffmpeg libavcodec-dev \
20+
libopencv-dev libaravis-dev \
21+
doxygen graphviz
1822
1923
- uses: actions/checkout@v4
2024
with:

CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,25 +324,25 @@ COMMAND echo
324324
)
325325
endif(DOXYGEN_FOUND)
326326
327-
# Ubuntu 20.04 packaging
327+
# Ubuntu 24.04 packaging
328328
set(CPACK_GENERATOR "DEB")
329329
set(CPACK_PACKAGE_VERSION "${VERSION_FOR_DEB}")
330330
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Jure Varlec <jure.varlec@ad-vega.si>")
331331
set(CPACK_DEBIAN_PACKAGE_SECTION "video")
332332
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_DESCRIPTION}")
333333
set(CPACK_PACKAGING_INSTALL_PREFIX /usr/)
334334
set(CPACK_DEBIAN_PACKAGE_DEPENDS "\
335-
libaravis-0.6-0, \
336-
libopencv-highgui4.2, \
337-
libavcodec58, \
338-
libswscale5, \
335+
libaravis-0.8-0, \
336+
libopencv-highgui40t64, \
337+
libavcodec60, \
338+
libswscale7, \
339339
ffmpeg, \
340-
libqt5core5a, \
341-
libqt5gui5, \
342-
libqt5widgets5, \
343-
libqt5network5, \
340+
libqt5core5t64, \
341+
libqt5gui5t64, \
342+
libqt5widgets5t64, \
343+
libqt5network5t64, \
344344
libqt5svg5, \
345-
libqt5concurrent5 \
345+
libqt5concurrent5t64 \
346346
")
347347
348348
include(CPack)

0 commit comments

Comments
 (0)