From 762231b479d21a71cd2f16112975557badde3321 Mon Sep 17 00:00:00 2001 From: David Muckle Date: Wed, 13 Dec 2017 16:53:01 -0500 Subject: [PATCH 1/6] Add libcurl as dependency for Ubuntu builds --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b02ec4e02..8917d2872 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,6 +223,7 @@ if (GENERATE_DEB MATCHES "1") libboost-atomic${DEB_BOOST_VERSION}, libboost-chrono${DEB_BOOST_VERSION}, libmicrohttpd${DEB_MICROHTTPD_VERSION}, + libcurl3, libogg0, libvorbis0a, libvorbisfile3, From a6df4547c75e4df6b6494b43e334ecd3ee659996 Mon Sep 17 00:00:00 2001 From: David Muckle Date: Thu, 14 Dec 2017 02:12:22 -0500 Subject: [PATCH 2/6] Push built packages to packagecloud --- .circleci/config.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fea36a700..483d938ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,8 @@ jobs: - run: apt-get install -y build-essential clang cmake libboost-thread1.58-dev libboost-system1.58-dev libboost-filesystem1.58-dev libboost-date-time1.58-dev libboost-atomic1.58-dev libboost-chrono1.58-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=xenial -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package + - run: apt-get install -y ruby && gem install package_cloud + - run: package_cloud push dvdmuckle/musikcube/ubuntu/xenial *.deb - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: path: /root/debs/ @@ -21,6 +23,8 @@ jobs: - run: apt-get install -y build-essential clang cmake libboost-thread1.63-dev libboost-system1.63-dev libboost-filesystem1.63-dev libboost-date-time1.63-dev libboost-atomic1.63-dev libboost-chrono1.63-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=artful -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package + - run: apt-get install -y ruby && gem install package_cloud + - run: package_cloud push dvdmuckle/musikcube/ubuntu/artful *.deb - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: path: /root/debs/ @@ -33,6 +37,8 @@ jobs: - run: apt-get -y install build-essential clang cmake libboost-thread1.61-dev libboost-system1.61-dev libboost-filesystem1.61-dev libboost-date-time1.61-dev libboost-atomic1.61-dev libboost-chrono1.61-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=zesty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package + - run: apt-get install -y ruby && gem install package_cloud + - run: package_cloud push dvdmuckle/musikcube/ubuntu/zesty *.deb - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: path: /root/debs/ @@ -44,6 +50,8 @@ jobs: - run: dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm rpm-build rpmdevtools 'dnf-command(builddep)' - run: dnf builddep -y musikcube.spec - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec + - run: dnf install -y ruby && gem install package_cloud + - run: package_cloud push dvdmuckle/musikcube/fedora/26 *.deb - run: rpmbuild -ba -vv musikcube.spec - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ - store_artifacts: @@ -57,6 +65,8 @@ jobs: - run: dnf builddep -y musikcube.spec - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec - run: rpmbuild -ba -vv musikcube.spec + - run: dnf install -y ruby && gem install package_cloud + - run: package_cloud push dvdmuckle/musikcube/fedora/27 *.deb - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ - store_artifacts: path: /root/rpms/ From da30e3a067c0db2801f747f490e8a681789bf7b7 Mon Sep 17 00:00:00 2001 From: David Muckle Date: Thu, 14 Dec 2017 02:25:55 -0500 Subject: [PATCH 3/6] Install proper ruby pkgs to appease packagecloud gem --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 483d938ee..09eb893d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: - run: apt-get install -y build-essential clang cmake libboost-thread1.58-dev libboost-system1.58-dev libboost-filesystem1.58-dev libboost-date-time1.58-dev libboost-atomic1.58-dev libboost-chrono1.58-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=xenial -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package - - run: apt-get install -y ruby && gem install package_cloud + - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud - run: package_cloud push dvdmuckle/musikcube/ubuntu/xenial *.deb - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: @@ -23,7 +23,7 @@ jobs: - run: apt-get install -y build-essential clang cmake libboost-thread1.63-dev libboost-system1.63-dev libboost-filesystem1.63-dev libboost-date-time1.63-dev libboost-atomic1.63-dev libboost-chrono1.63-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=artful -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package - - run: apt-get install -y ruby && gem install package_cloud + - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud - run: package_cloud push dvdmuckle/musikcube/ubuntu/artful *.deb - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: @@ -37,7 +37,7 @@ jobs: - run: apt-get -y install build-essential clang cmake libboost-thread1.61-dev libboost-system1.61-dev libboost-filesystem1.61-dev libboost-date-time1.61-dev libboost-atomic1.61-dev libboost-chrono1.61-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=zesty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package - - run: apt-get install -y ruby && gem install package_cloud + - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud - run: package_cloud push dvdmuckle/musikcube/ubuntu/zesty *.deb - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: @@ -50,7 +50,7 @@ jobs: - run: dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm rpm-build rpmdevtools 'dnf-command(builddep)' - run: dnf builddep -y musikcube.spec - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec - - run: dnf install -y ruby && gem install package_cloud + - run: dnf install -y ruby ruby-devel && gem install package_cloud - run: package_cloud push dvdmuckle/musikcube/fedora/26 *.deb - run: rpmbuild -ba -vv musikcube.spec - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ @@ -65,7 +65,7 @@ jobs: - run: dnf builddep -y musikcube.spec - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec - run: rpmbuild -ba -vv musikcube.spec - - run: dnf install -y ruby && gem install package_cloud + - run: dnf install -y ruby ruby-devel && gem install package_cloud - run: package_cloud push dvdmuckle/musikcube/fedora/27 *.deb - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ - store_artifacts: From cf9d7c89a083deb2a0259d2e89cf2001c8d4b593 Mon Sep 17 00:00:00 2001 From: David Muckle Date: Thu, 14 Dec 2017 12:42:00 -0500 Subject: [PATCH 4/6] Further appease packagecloud --- .circleci/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 09eb893d6..af883214a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,9 +9,9 @@ jobs: - run: apt-get install -y build-essential clang cmake libboost-thread1.58-dev libboost-system1.58-dev libboost-filesystem1.58-dev libboost-date-time1.58-dev libboost-atomic1.58-dev libboost-chrono1.58-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=xenial -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package - - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud - - run: package_cloud push dvdmuckle/musikcube/ubuntu/xenial *.deb + - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - run: package_cloud push dvdmuckle/musikcube/ubuntu/xenial /root/debs/*.deb - store_artifacts: path: /root/debs/ build_ubuntu_artful: @@ -23,9 +23,9 @@ jobs: - run: apt-get install -y build-essential clang cmake libboost-thread1.63-dev libboost-system1.63-dev libboost-filesystem1.63-dev libboost-date-time1.63-dev libboost-atomic1.63-dev libboost-chrono1.63-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=artful -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package - - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud - - run: package_cloud push dvdmuckle/musikcube/ubuntu/artful *.deb + - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - run: package_cloud push dvdmuckle/musikcube/ubuntu/artful /root/debs/*.deb - store_artifacts: path: /root/debs/ build_ubuntu_zesty: @@ -37,9 +37,9 @@ jobs: - run: apt-get -y install build-essential clang cmake libboost-thread1.61-dev libboost-system1.61-dev libboost-filesystem1.61-dev libboost-date-time1.61-dev libboost-atomic1.61-dev libboost-chrono1.61-dev libogg-dev libvorbis-dev libflac-dev libfaad-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=zesty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - run: make -j2 && make package - - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud - - run: package_cloud push dvdmuckle/musikcube/ubuntu/zesty *.deb + - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - run: package_cloud push dvdmuckle/musikcube/ubuntu/zesty /root/debs/*.deb - store_artifacts: path: /root/debs/ build_fedora_26: @@ -50,10 +50,10 @@ jobs: - run: dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm rpm-build rpmdevtools 'dnf-command(builddep)' - run: dnf builddep -y musikcube.spec - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec - - run: dnf install -y ruby ruby-devel && gem install package_cloud - - run: package_cloud push dvdmuckle/musikcube/fedora/26 *.deb - run: rpmbuild -ba -vv musikcube.spec + - run: dnf install -y ruby ruby-devel && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ + - run: package_cloud push dvdmuckle/musikcube/fedora/26 /root/rpms/*.rpm - store_artifacts: path: /root/rpms/ build_fedora_27: @@ -65,9 +65,9 @@ jobs: - run: dnf builddep -y musikcube.spec - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec - run: rpmbuild -ba -vv musikcube.spec - - run: dnf install -y ruby ruby-devel && gem install package_cloud - - run: package_cloud push dvdmuckle/musikcube/fedora/27 *.deb + - run: dnf install -y ruby ruby-devel && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ + - run: package_cloud push dvdmuckle/musikcube/fedora/27 /root/rpms/*.rpm - store_artifacts: path: /root/rpms/ From c80182de0d0e2ac9aec0c967e96bb27839dee454 Mon Sep 17 00:00:00 2001 From: David Muckle Date: Thu, 14 Dec 2017 12:53:00 -0500 Subject: [PATCH 5/6] Pass build even if package already exists --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index af883214a..132f4c7e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: - run: make -j2 && make package - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - - run: package_cloud push dvdmuckle/musikcube/ubuntu/xenial /root/debs/*.deb + - run: package_cloud push --skip-errors dvdmuckle/musikcube/ubuntu/xenial /root/debs/*.deb - store_artifacts: path: /root/debs/ build_ubuntu_artful: @@ -25,7 +25,7 @@ jobs: - run: make -j2 && make package - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - - run: package_cloud push dvdmuckle/musikcube/ubuntu/artful /root/debs/*.deb + - run: package_cloud push --skip-errors dvdmuckle/musikcube/ubuntu/artful /root/debs/*.deb - store_artifacts: path: /root/debs/ build_ubuntu_zesty: @@ -39,7 +39,7 @@ jobs: - run: make -j2 && make package - run: apt-get install -y ruby ruby-all-dev && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - - run: package_cloud push dvdmuckle/musikcube/ubuntu/zesty /root/debs/*.deb + - run: package_cloud push --skip-errors dvdmuckle/musikcube/ubuntu/zesty /root/debs/*.deb - store_artifacts: path: /root/debs/ build_fedora_26: @@ -53,7 +53,7 @@ jobs: - run: rpmbuild -ba -vv musikcube.spec - run: dnf install -y ruby ruby-devel && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ - - run: package_cloud push dvdmuckle/musikcube/fedora/26 /root/rpms/*.rpm + - run: package_cloud push --skip-errors dvdmuckle/musikcube/fedora/26 /root/rpms/*.rpm - store_artifacts: path: /root/rpms/ build_fedora_27: @@ -67,7 +67,7 @@ jobs: - run: rpmbuild -ba -vv musikcube.spec - run: dnf install -y ruby ruby-devel && gem install package_cloud -v 0.2.44 - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ - - run: package_cloud push dvdmuckle/musikcube/fedora/27 /root/rpms/*.rpm + - run: package_cloud push --skip-errors dvdmuckle/musikcube/fedora/27 /root/rpms/*.rpm - store_artifacts: path: /root/rpms/ From 89d4d79991c41aeeb7989a0b674e5a7c60ade317 Mon Sep 17 00:00:00 2001 From: David Muckle Date: Thu, 14 Dec 2017 15:52:56 -0500 Subject: [PATCH 6/6] Input correct license --- musikcube.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musikcube.spec b/musikcube.spec index f8192c229..a7eb080c5 100644 --- a/musikcube.spec +++ b/musikcube.spec @@ -6,7 +6,7 @@ Version: %{version} Release: %{build_timestamp}%{dist} Summary: A cross-platform, terminal-based audio engine, library, player and server written in C++ Source0: https://github.com/clangen/musikcube/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -License: GPLv3 +License: BSD-3-Clause Packager: David Muckle BuildRequires: gcc-c++ cmake boost-devel libogg-devel libvorbis-devel flac-devel faad2-devel ncurses-devel zlib-devel alsa-lib-devel pulseaudio-libs-devel libcurl-devel libmicrohttpd-devel lame-devel make Requires: boost libogg libvorbis flac ncurses zlib alsa-lib pulseaudio-libs libcurl libmicrohttpd lame