Skip to content

Commit

Permalink
circleci: Allow expanding Makefile in enterpise (#9587)
Browse files Browse the repository at this point in the history
OSS no longer needs the multi-file config Makefile content, so it was
removed. However, enterprise does benefit from having that around. We
can allow enterprise to expand on OSS' CircleCI Makefile by adding an
include directive in OSS. This will allow the Makefile to be the same on
both OSS and Enterprise, so merge conflicts cannot occur.
  • Loading branch information
Kris Hicks authored Dec 9, 2020
1 parent c1f1b15 commit 8333ab9
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .circleci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,11 @@ help:
.PHONY: ci-verify
ci-verify:
@$(CIRCLECI) config validate config.yml

MKFILE_PATH := $(lastword $(filter %Makefile,$(MAKEFILE_LIST)))
CURRENT_DIR := $(dir $(realpath $(MKFILE_PATH)))
CURRENT_DIR := $(CURRENT_DIR:/=)

ifneq ($(wildcard $(CURRENT_DIR)/*.mk),)
include $(CURRENT_DIR)/*.mk
endif

0 comments on commit 8333ab9

Please sign in to comment.