diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ac0b76de..a9b17640a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,6 +136,20 @@ jobs: - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: path: /root/debs/ + build_debian_bullseye: + docker: + - image: debian:bullseye + steps: + - run: apt-get update + - run: DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" apt-get install -y git ssh sshpass build-essential clang cmake libboost-thread1.74-dev libboost-system1.74-dev libboost-filesystem1.74-dev libboost-date-time1.74-dev libboost-atomic1.74-dev libboost-chrono1.74-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev libtag1-dev libsystemd-dev + - checkout + - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_PLATFORM=debian -DDEB_DISTRO=bullseye -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . + - run: make -j2 + - run: make package + - run: ./script/copy-artifacts-to-host.sh /root/project/*.deb + - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - store_artifacts: + path: /root/debs/ workflow_filters: &workflow_filters filters: branches: @@ -156,3 +170,4 @@ workflows: - build_fedora_35: *workflow_filters - build_mint_uma: *workflow_filters - build_debian_buster: *workflow_filters + - build_debian_bullseye: *workflow_filters diff --git a/CMakeLists.txt b/CMakeLists.txt index 964d59f61..ae984edee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -324,6 +324,14 @@ if (GENERATE_DEB MATCHES "1") set(DEB_AVFORMAT_VERSION "58") set(DEB_SWRESAMPLE_VERSION "3") set(DEB_NCURSES_VERSION "6") + elseif (DEB_DISTRO MATCHES "impish" OR DEB_DISTRO MATCHES "bullseye") + set(DEB_BOOST_VERSION "1.74.0") + set(DEB_MICROHTTPD_VERSION "12") + set(DEB_LIBCURL_VERSION "4") + set(DEB_AVUTIL_VERSION "56") + set(DEB_AVFORMAT_VERSION "58") + set(DEB_SWRESAMPLE_VERSION "3") + set(DEB_NCURSES_VERSION "6") endif() set(DEPENDENCIES "libboost-thread${DEB_BOOST_VERSION}, libboost-system${DEB_BOOST_VERSION}, libboost-chrono${DEB_BOOST_VERSION}, libboost-filesystem${DEB_BOOST_VERSION}, libboost-date-time${DEB_BOOST_VERSION}, libmicrohttpd${DEB_MICROHTTPD_VERSION}, libcurl${DEB_LIBCURL_VERSION}, libogg0, libvorbis0a, libvorbisfile3, libncursesw${DEB_NCURSES_VERSION}, libasound2, libpulse0, pulseaudio, libmp3lame0, libev4, libopenmpt0, libssl1.1") diff --git a/script/run-circle-ci.sh b/script/run-circle-ci.sh index 57cf23169..802c36ff0 100755 --- a/script/run-circle-ci.sh +++ b/script/run-circle-ci.sh @@ -44,6 +44,7 @@ ALL_JOBS=( "build_fedora_35" "build_mint_uma" "build_debian_buster" + "build_debian_bullseye" ) BRANCH="clangen/local-circle-ci"