Skip to content
This repository was archived by the owner on Oct 31, 2021. It is now read-only.

Commit e2df8bc

Browse files
committed
Fixing directory error.
1 parent 7ba2849 commit e2df8bc

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ OS=$(shell uname -s | tr A-Z a-z)
1414
ENVIRONMENT ?= $(shell echo $${BUIlDKITE_GITHUB_DEPLOYMENT_ENVIRONMENT:-Local})
1515
ENV_LOWER = $(shell echo $(ENVIRONMENT) | tr A-Z a-z)
1616

17-
GENERATED=$(PWD)/generated
18-
GENERATED_YAML=$(GENERATED)/$(ENV_LOWER)
17+
GENERATED_YAML=$(PWD)/generated/$(ENV_LOWER)
1918

2019
ifndef POSTGRES_DB
2120
POSTGRES_DB=postgres
@@ -128,11 +127,12 @@ TEMPLATE_FILES=$(PWD)/templates/*
128127

129128
$(GENERATED_YAML): $(VALUES_FILES) $(TEMPLATE_FILES)
130129
$(GENERATED_YAML): IMAGE_TAG=$(shell git rev-parse HEAD)
131-
$(GENERATED_YAML): $(HELM) $(SPLIT_YAML) $(GENERATED)
130+
$(GENERATED_YAML): $(HELM) $(SPLIT_YAML)
132131
$(call infoMsg,Generating Kubernetes yaml using Helm output to: $(GENERATED_YAML))
133132
$(call infoMsg,Environment: $(ENVIRONMENT))
134133
$(call infoMsg,Using values file: $(VALUES_FILE))
135134
-rm -rf $(GENERATED_YAML)
135+
-mkdir -p $(GENERATED_YAML)
136136
$(HELM) template rest-api $(PWD) \
137137
--dry-run \
138138
--set image.tag="$(IMAGE_TAG)" \

scripts/Dependencies.mk

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ $(LOCAL_BIN):
44
$(LOCAL_TMP):
55
@if [ ! -f "$(LOCAL_TMP)" ]; then mkdir -p $(LOCAL_TMP); fi
66

7-
$(GENERATED):
8-
@if [ ! -f "$(GENERATED)" ]; then mkdir -p $(GENERATED); fi
9-
107
CURL=$(shell which curl)
118

129
# If curl is not installed then we have some basic stuff to install it.

0 commit comments

Comments
 (0)