From 4c4d98661544efe2c8cd5ac231c33a5575823711 Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Tue, 7 Jan 2020 09:56:40 -0500 Subject: [PATCH 1/3] initiates docker daemon for circle windows builds --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7cb2005459cf..a100351086fab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,6 +64,7 @@ jobs: <<: *defaults steps: - checkout + - setup_remote_docker - run: name: build command: make GOOS=windows GOGC=10 promtail From 92c39cf812861772a88131499049f657d45e6de4 Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Tue, 7 Jan 2020 10:44:18 -0500 Subject: [PATCH 2/3] touch-protos amke target, circle windows build uses it --- .circleci/config.yml | 3 +++ Makefile | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a100351086fab..3de2b6e099b90 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,6 +65,9 @@ jobs: steps: - checkout - setup_remote_docker + - run: + name: touch-protos + command: make touch-protos - run: name: build command: make GOOS=windows GOGC=10 promtail diff --git a/Makefile b/Makefile index 8197ce7fdda8c..663d7950f9c2c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .DEFAULT_GOAL := all -.PHONY: all images check-generated-files logcli loki loki-debug promtail promtail-debug loki-canary lint test clean yacc protos touch-protobuf-sources +.PHONY: all images check-generated-files logcli loki loki-debug promtail promtail-debug loki-canary lint test clean yacc protos touch-protobuf-sources touch-protos .PHONY: helm helm-install helm-upgrade helm-publish helm-debug helm-clean .PHONY: docker-driver docker-driver-clean docker-driver-enable docker-driver-push .PHONY: fluent-bit-image, fluent-bit-push, fluent-bit-test @@ -288,6 +288,9 @@ endif protos: $(PROTO_GOS) +touch-protos: $(PROTO_GOS) + for proto in $^; do touch "$${proto}"; done + %.pb.go: $(PROTO_DEFS) ifeq ($(BUILD_IN_CONTAINER),true) @mkdir -p $(shell pwd)/.pkg From 0bd8646819df990d3091cde1edf9a1783ca86690 Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Tue, 7 Jan 2020 10:56:59 -0500 Subject: [PATCH 3/3] touch-protos doenst explicitly depend on $(PROTO_GOS) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 663d7950f9c2c..490a9575ac873 100644 --- a/Makefile +++ b/Makefile @@ -288,8 +288,8 @@ endif protos: $(PROTO_GOS) -touch-protos: $(PROTO_GOS) - for proto in $^; do touch "$${proto}"; done +touch-protos: + for proto in $(PROTO_GOS); do [ -f "./$${proto}" ] && touch "$${proto}" && echo "touched $${proto}"; done %.pb.go: $(PROTO_DEFS) ifeq ($(BUILD_IN_CONTAINER),true)