Ubuntu Groovy support

This commit is contained in:
casey langen 2020-10-22 17:15:24 -07:00
parent 60a206a2d6
commit e44c6be68d
3 changed files with 16 additions and 2 deletions

View File

@ -39,6 +39,19 @@ jobs:
- run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/
- store_artifacts: - store_artifacts:
path: /root/debs/ path: /root/debs/
build_ubuntu_groovy:
docker:
- image: ubuntu:groovy
steps:
- checkout
- run: apt-get update
- run: DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" apt-get install -y build-essential clang cmake libboost-thread1.71-dev libboost-system1.71-dev libboost-filesystem1.71-dev libboost-date-time1.71-dev libboost-atomic1.71-dev libboost-chrono1.71-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
- run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_PLATFORM=ubuntu -DDEB_DISTRO=groovy -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
- run: make -j2
- run: make package
- run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/
- store_artifacts:
path: /root/debs/
build_fedora_31: build_fedora_31:
docker: docker:
- image: fedora:31 - image: fedora:31
@ -76,5 +89,6 @@ workflows:
- build_ubuntu_bionic: *workflow_filters - build_ubuntu_bionic: *workflow_filters
- build_ubuntu_eoan: *workflow_filters - build_ubuntu_eoan: *workflow_filters
- build_ubuntu_focal: *workflow_filters - build_ubuntu_focal: *workflow_filters
- build_ubuntu_groovy: *workflow_filters
- build_fedora_31: *workflow_filters - build_fedora_31: *workflow_filters
- build_fedora_32: *workflow_filters - build_fedora_32: *workflow_filters

View File

@ -286,7 +286,7 @@ if (GENERATE_DEB MATCHES "1")
set(DEB_AVUTIL_VERSION "56") set(DEB_AVUTIL_VERSION "56")
set(DEB_AVFORMAT_VERSION "58") set(DEB_AVFORMAT_VERSION "58")
set(DEB_SWRESAMPLE_VERSION "3") set(DEB_SWRESAMPLE_VERSION "3")
elseif (DEB_DISTRO MATCHES "focal") elseif (DEB_DISTRO MATCHES "focal" OR DEB_DISTRO MATCHES "groovy")
set(DEB_BOOST_VERSION "1.71.0") set(DEB_BOOST_VERSION "1.71.0")
set(DEB_MICROHTTPD_VERSION "12") set(DEB_MICROHTTPD_VERSION "12")
set(DEB_LIBCURL_VERSION "4") set(DEB_LIBCURL_VERSION "4")

View File

@ -6,7 +6,7 @@ if [ $OS == "Linux" ]; then
DISTRO=`lsb_release -cs` DISTRO=`lsb_release -cs`
echo "detected ${DISTRO}" echo "detected ${DISTRO}"
case $DISTRO in case $DISTRO in
"focal") "focal" | "groovy")
sudo apt-get install build-essential clang cmake libboost-thread1.71-dev libboost-system1.71-dev libboost-filesystem1.71-dev libboost-date-time1.71-dev libboost-atomic1.71-dev libboost-chrono1.71-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncurses-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libtag1-dev libsystemd-dev libavcodec-extra libopenmpt-dev libssl-dev sudo apt-get install build-essential clang cmake libboost-thread1.71-dev libboost-system1.71-dev libboost-filesystem1.71-dev libboost-date-time1.71-dev libboost-atomic1.71-dev libboost-chrono1.71-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncurses-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libtag1-dev libsystemd-dev libavcodec-extra libopenmpt-dev libssl-dev
;; ;;
"cosmic" | "disco" | "eoan") "cosmic" | "disco" | "eoan")