From b572cb165621e568b1005414b1f5efe85e87c199 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Fri, 4 Oct 2019 12:30:07 +0100 Subject: [PATCH 1/5] Add Debian Buster builder --- .circleci/config.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1bb13ed53..90e54213f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -264,6 +264,44 @@ commands: taglib-devel tar + install_buster_dependencies: + description: Install Buster dependencies + steps: + - run: + name: Install Dependencies + command: > + apt-get update && apt-get install -y + build-essential + cmake + gettext + git + libasound2-dev + libboost-dev + libcdio-dev + libchromaprint-dev + libcrypto++-dev + libdbus-1-dev + libfftw3-dev + libglew1.5-dev + libglib2.0-dev + libgpod-dev + libgstreamer-plugins-base1.0-dev + libgstreamer1.0-dev + liblastfm-dev + libmtp-dev + libmygpo-qt-dev + libprotobuf-dev + libpulse-dev + libqjson-dev + libqt4-dev + libsparsehash-dev + libsqlite3-dev + libtag1-dev + pkg-config + protobuf-compiler + qt4-dev-tools + ssh + jobs: build_disco_64: docker: @@ -349,6 +387,19 @@ jobs: - copy_artifacts: build: ubuntu-xenial + build_buster_64: + docker: + - image: debian:buster + steps: + - install_buster_dependencies + - checkout + - cmake_debian: + distribution: buster + arch: amd64 + - make_deb + - copy_artifacts: + build: debian-buster + build_fedora_29_64: docker: - image: fedora:29 From 320bca2faf6d17c6f4b2d3cb1458c5a537fdaa58 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Fri, 4 Oct 2019 13:18:45 +0100 Subject: [PATCH 2/5] Add Buster builder to workflow --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90e54213f..64fd26004 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -533,6 +533,7 @@ workflows: - build_disco_64 - build_fedora_29_64 - build_fedora_30_64 + - build_buster_64 - upload_artifacts: context: gcp @@ -545,6 +546,7 @@ workflows: - build_disco_64 - build_fedora_29_64 - build_fedora_30_64 + - build_buster_64 filters: branches: only: master From 94a5d17890fe439e64671d9a526b3dc5646647aa Mon Sep 17 00:00:00 2001 From: John Maguire Date: Fri, 4 Oct 2019 13:39:00 +0100 Subject: [PATCH 3/5] Add Debian Stretch builder --- .circleci/config.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64fd26004..5b74872f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -264,8 +264,8 @@ commands: taglib-devel tar - install_buster_dependencies: - description: Install Buster dependencies + install_debian_dependencies: + description: Install Debian dependencies steps: - run: name: Install Dependencies @@ -391,7 +391,7 @@ jobs: docker: - image: debian:buster steps: - - install_buster_dependencies + - install_debian_dependencies - checkout - cmake_debian: distribution: buster @@ -400,6 +400,19 @@ jobs: - copy_artifacts: build: debian-buster + build_stretch_64: + docker: + - image: debian:stretch + steps: + - install_debian_dependencies + - checkout + - cmake_debian: + distribution: stretch + arch: amd64 + - make_deb + - copy_artifacts: + build: debian-stretch + build_fedora_29_64: docker: - image: fedora:29 From d2ad9a5a0fd4d299761ad8078ea9eda9e464fae4 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Fri, 4 Oct 2019 13:40:25 +0100 Subject: [PATCH 4/5] Add stretch builder to workflow --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b74872f8..9b5666979 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -547,6 +547,7 @@ workflows: - build_fedora_29_64 - build_fedora_30_64 - build_buster_64 + - build_stretch_64 - upload_artifacts: context: gcp @@ -560,6 +561,7 @@ workflows: - build_fedora_29_64 - build_fedora_30_64 - build_buster_64 + - build_stretch_64 filters: branches: only: master From 540d1f4a0d34ce179dc2c72b0d8fbfc9b8843e3d Mon Sep 17 00:00:00 2001 From: John Maguire Date: Fri, 4 Oct 2019 13:55:52 +0100 Subject: [PATCH 5/5] Fix upload directories --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b5666979..1a8b4b460 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,9 +70,9 @@ commands: name: Copy deb to artifacts directory command: cp bin/clementine_*.deb /tmp/artifacts/<< parameters.build >>/ - persist_to_workspace: - root: /tmp/artifacts/<< parameters.build >> + root: /tmp/artifacts paths: - - "*" + - << parameters.build >>/* - store_artifacts: path: /tmp/artifacts/<< parameters.build >> copy_rpm_artifacts: @@ -89,9 +89,9 @@ commands: name: Copy RPM to artifacts directory command: cp ~/rpmbuild/RPMS/*/clementine-*.rpm /tmp/artifacts/<< parameters.build >> - persist_to_workspace: - root: /tmp/artifacts/<< parameters.build >> + root: /tmp/artifacts paths: - - "*" + - << parameters.build >>/* - store_artifacts: path: /tmp/artifacts/<< parameters.build >> install_xenial_dependencies: @@ -513,9 +513,9 @@ jobs: name: Copy dmg to artifacts directory command: cp bin/clementine*.dmg /tmp/artifacts/mac - persist_to_workspace: - root: /tmp/artifacts/mac + root: /tmp/artifacts paths: - - "*" + - mac/* - store_artifacts: path: /tmp/artifacts/mac