diff --git a/.circleci/config.yml b/.circleci/config.yml index 09794f1ab..e85c70282 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ commands: parameters: build: type: string - default: fedora-29 + default: fedora-30 steps: - run: name: Create artifact output directory @@ -152,59 +152,6 @@ commands: qttools5-dev libsparsehash-dev ssh - install_disco_dependencies: - description: Install Disco dependencies - steps: - - run: - name: Setup ENV - command: | - echo 'export DEBIAN_FRONTEND=noninteractive' >> $BASH_ENV - source $BASH_ENV - - run: - name: Use AWS Ubuntu mirror - command: > - sed -i /etc/apt/sources.list - -e 's#archive.ubuntu.com#us-east-2.ec2.archive.ubuntu.com#' - - run: - name: Install Dependencies - command: > - apt-get update && apt-get install -y - cmake - fakeroot - gettext - git - libasound2-dev - libboost-dev - libboost-serialization-dev - libcdio-cdda2 - libcdio-dev - libchromaprint-dev - libcrypto++-dev - libdbus-1-dev - libfftw3-dev - libglew1.5-dev - libgpod-dev - libgstreamer-plugins-base1.0-dev - libgstreamer1.0-dev - liblastfm5-dev - libmtp-dev - libmygpo-qt-dev - libplist-dev - libprotobuf-dev - libpulse-dev - libqca2-dev - libqca2-plugins - libqt5x11extras5-dev - libqtwebkit-dev - libsparsehash-dev - libsqlite3-dev - libtag1-dev - libusbmuxd-dev - protobuf-compiler - qtbase5-dev - qttools5-dev-tools - qttools5-dev - ssh install_eoan_dependencies: description: Install Eoan dependencies @@ -343,34 +290,6 @@ commands: ssh jobs: - build_disco_64: - docker: - - image: ubuntu:disco - - steps: - - install_disco_dependencies - - checkout - - cmake_debian: - distribution: disco - arch: amd64 - - make_deb - - copy_artifacts: - build: ubuntu-disco - - build_disco_32: - docker: - - image: i386/ubuntu:disco - - steps: - - install_disco_dependencies - - checkout - - cmake_debian: - distribution: disco - arch: i386 - - make_deb - - copy_artifacts: - build: ubuntu-disco - build_bionic_64: docker: - image: ubuntu:bionic @@ -451,21 +370,6 @@ jobs: - copy_artifacts: build: debian-stretch - build_fedora_29_64: - docker: - - image: fedora:29 - environment: - RPM_BUILD_NCPUS: "2" - - steps: - - install_fedora_dependencies - - checkout - - cmake - - build_source_tarball - - build_rpm - - copy_rpm_artifacts: - build: fedora-29 - build_fedora_30_64: docker: - image: fedora:30 @@ -817,14 +721,6 @@ workflows: filters: tags: only: /.*/ - - build_disco_64: - filters: - tags: - only: /.*/ - - build_disco_32: - filters: - tags: - only: /.*/ - build_bionic_64: filters: tags: @@ -841,10 +737,6 @@ workflows: filters: tags: only: /.*/ - - build_fedora_29_64: - filters: - tags: - only: /.*/ - build_fedora_30_64: filters: tags: @@ -877,13 +769,10 @@ workflows: requires: - build_eoan_64 - build_eoan_32 - - build_disco_64 - - build_disco_32 - build_bionic_64 - build_bionic_32 - build_buster_64 - build_stretch_64 - - build_fedora_29_64 - build_fedora_30_64 - build_fedora_31_64 - build_mingw @@ -894,13 +783,10 @@ workflows: requires: - build_eoan_64 - build_eoan_32 - - build_disco_64 - - build_disco_32 - build_bionic_64 - build_bionic_32 - build_buster_64 - build_stretch_64 - - build_fedora_29_64 - build_fedora_30_64 - build_fedora_31_64 - build_mingw