From aa427ed812cdbacdd6608c4e7697d2a9e713090e Mon Sep 17 00:00:00 2001 From: reimda Date: Wed, 2 Jun 2021 13:19:33 -0600 Subject: [PATCH] Parallel build fixes (#9326) --- .circleci/config.yml | 5 ++++- Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 26758b951..4296082e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,10 @@ commands: - run: 'mips=1 mipsel=1 arm64=1 amd64=1 static=1 armel=1 armhf=1 s390x=1 ppc641e=1 i386=1 windows=1 darwin=1 NIGHTLY=1 make package' - run: 'make upload-nightly' - unless: - condition: << parameters.nightly >> + condition: + or: + - << parameters.nightly >> + - << parameters.release >> steps: - run: '<< parameters.type >>=1 make package' - store_artifacts: diff --git a/Makefile b/Makefile index ee9c1b71d..1537e0f05 100644 --- a/Makefile +++ b/Makefile @@ -247,7 +247,7 @@ endif ifdef amd64 tars += telegraf-$(tar_version)_freebsd_amd64.tar.gz tars += telegraf-$(tar_version)_linux_amd64.tar.gz -debs := telegraf_$(deb_version)_amd64.deb +debs += telegraf_$(deb_version)_amd64.deb rpms += telegraf-$(rpm_version).x86_64.rpm endif