From c1a34f3b86e074c9595771ed13ff4eace1af01c4 Mon Sep 17 00:00:00 2001 From: joneshf Date: Sun, 29 Jul 2018 12:32:17 -0700 Subject: [PATCH] Persist the make cache If we don't do this, the test job will try to rebuild everything. That defeats the purpose. Probably, we've got our Make dependencies/targets setup improprerly. --- .circleci/config.yml | 4 ++++ Makefile | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 346a92d..c0b66f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,10 @@ jobs: - run: name: Compile command: make build + - persist_to_workspace: + root: .make + paths: + - '*' - persist_to_workspace: root: dist paths: diff --git a/Makefile b/Makefile index 10bb979..ea3976d 100644 --- a/Makefile +++ b/Makefile @@ -30,9 +30,6 @@ $(EMPTY)/build: $(EMPTY)/stack-setup README.md Setup.hs package.yaml stack.yaml cp -R $$($(STACK) $(STACK_FLAGS) path --dist-dir)/build $(DIST)/build touch $@ -$(EMPTY)/doc-test: $(EMPTY)/build - touch $@ - $(EMPTY)/stack-setup: | $(EMPTY) $(STACK) $(STACK_FLAGS) setup touch $@