From b980f50d3aec65ab6cd8a6f6b3204e76a309ad59 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 5 Dec 2018 12:57:21 +0000 Subject: [PATCH] Use new build image, don't delete generated files on clean. Signed-off-by: Tom Wilkie --- .circleci/config.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 48d7a6273fa5..eb6fd2724411 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ workflows: # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/ defaults: &defaults docker: - - image: grafana/loki-build-image:checkin-generated-files-86c363c + - image: grafana/loki-build-image:rename-49e21d5-WIP working_directory: /go/src/github.com/grafana/loki jobs: diff --git a/Makefile b/Makefile index aed5fbdbbb45..932cf43541de 100644 --- a/Makefile +++ b/Makefile @@ -157,5 +157,5 @@ push-images: clean: $(SUDO) docker rmi $(IMAGE_NAMES) >/dev/null 2>&1 || true - rm -rf $(UPTODATE_FILES) $(EXES) $(PROTO_GOS) $(YACC_GOS) .cache + rm -rf $(UPTODATE_FILES) $(EXES) .cache go clean ./...