Fix mint build configs, remove bionic.

.circleci/config.yml

@@ -1,19 +1,5 @@
 version: 2.0
 jobs:
-  build_ubuntu_bionic:
-    docker:
-      - image: ubuntu:bionic
-    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.65-dev libboost-system1.65-dev libboost-filesystem1.65-dev libboost-date-time1.65-dev libboost-atomic1.65-dev libboost-chrono1.65-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=ubuntu -DDEB_DISTRO=bionic -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/
   build_ubuntu_focal:
     docker:
       - image: ubuntu:focal
@@ -108,14 +94,14 @@ jobs:
       - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/
       - store_artifacts:
           path: /root/rpms/
-  build_mint_uma: # based on ubuntu focal
+  build_mint_una: # based on ubuntu focal
     docker:
-      - image: linuxmintd/mint20.2-amd64
+      - image: linuxmintd/mint20.3-amd64
     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.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
       - checkout
-      - run: cmake -DENABLE_PCH=true -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_PLATFORM=mint -DDEB_DISTRO=uma -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
+      - run: cmake -DENABLE_PCH=true -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_PLATFORM=mint -DDEB_DISTRO=una -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
       - run: make -j2
       - run: make package
       - run: ./script/copy-artifacts-to-host.sh /root/project/*.deb
@@ -160,7 +146,6 @@ workflows:
   version: 2
   build_and_package:
     jobs:
-      - build_ubuntu_bionic: *workflow_filters
       - build_ubuntu_focal: *workflow_filters
       - build_ubuntu_hirsute: *workflow_filters
       - build_ubuntu_impish: *workflow_filters
@@ -168,6 +153,6 @@ workflows:
       - build_fedora_33: *workflow_filters
       - build_fedora_34: *workflow_filters
       - build_fedora_35: *workflow_filters
-      - build_mint_uma: *workflow_filters
+      - build_mint_una: *workflow_filters
       - build_debian_buster: *workflow_filters
       - build_debian_bullseye: *workflow_filters

.cmake/GenerateDeb.cmake

@@ -7,21 +7,18 @@ if (GENERATE_DEB MATCHES "1")
     set(DEB_AVFORMAT_VERSION "57")
     set(DEB_SWRESAMPLE_VERSION "2")
     set(DEB_NCURSES_VERSION "5")
-    if (DEB_DISTRO MATCHES "artful")
+    if (DEB_DISTRO MATCHES "buster")
-      set(DEB_BOOST_VERSION "1.63.0")
-      set(DEB_MICROHTTPD_VERSION "12")
-    elseif (DEB_DISTRO MATCHES "bionic")
-      set(DEB_BOOST_VERSION "1.65.1")
-      set(DEB_MICROHTTPD_VERSION "12")
-      set(DEB_LIBCURL_VERSION "4")
-    elseif (DEB_DISTRO MATCHES "cosmic" OR DEB_DISTRO MATCHES "disco" OR DEB_DISTRO MATCHES "eoan" OR DEB_DISTRO MATCHES "buster")
       set(DEB_BOOST_VERSION "1.67.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")
-    elseif (DEB_DISTRO MATCHES "focal" OR DEB_DISTRO MATCHES "groovy" OR DEB_DISTRO MATCHES "ulyssa")
+    elseif (DEB_DISTRO MATCHES "bionic")
+      set(DEB_BOOST_VERSION "1.65.1")
+      set(DEB_MICROHTTPD_VERSION "12")
+      set(DEB_LIBCURL_VERSION "4")
+    elseif (DEB_DISTRO MATCHES "focal" OR DEB_DISTRO MATCHES "una")
       set(DEB_BOOST_VERSION "1.71.0")
       set(DEB_MICROHTTPD_VERSION "12")
       set(DEB_LIBCURL_VERSION "4")

script/build-vendor-libraries.sh

@@ -458,10 +458,9 @@ function build_lame() {
     fi
 }
 
+clean
 mkdir vendor
 cd vendor
-
-clean
 fetch_packages
 build_boost
 build_openssl

script/run-circle-ci.sh

@@ -34,7 +34,6 @@ circleci config process .circleci/config.yml > local-circle-ci.yml
 sed -i "s/-j2/-j${JOB_COUNT}/g" local-circle-ci.yml
 
 ALL_JOBS=(
-    "build_ubuntu_bionic"
     "build_ubuntu_focal"
     "build_ubuntu_hirsute"
     "build_ubuntu_impish"
@@ -42,7 +41,7 @@ ALL_JOBS=(
     "build_fedora_33"
     "build_fedora_34"
     "build_fedora_35"
-    "build_mint_uma"
+    "build_mint_una"
     "build_debian_buster"
     "build_debian_bullseye"
 )