Skip to content

Commit

Permalink
initiates docker daemon for circle windows builds (#1476)
Browse files Browse the repository at this point in the history
* initiates docker daemon for circle windows builds

* touch-protos amke target, circle windows build uses it

* touch-protos doenst explicitly depend on $(PROTO_GOS)
  • Loading branch information
owen-d authored and cyriltovena committed Jan 7, 2020
1 parent 4153740 commit 9e9652a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ jobs:
<<: *defaults
steps:
- checkout
- setup_remote_docker
- run:
name: touch-protos
command: make touch-protos
- run:
name: build
command: make GOOS=windows GOGC=10 promtail
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -288,6 +288,9 @@ endif

protos: $(PROTO_GOS)

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)
@mkdir -p $(shell pwd)/.pkg
Expand Down

0 comments on commit 9e9652a

Please sign in to comment.