Skip to content

Commit f080e98

Browse files
Update configuration
1 parent dd2d2c6 commit f080e98

25 files changed

+108
-875
lines changed

.platform/schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14
1+
15

Makefile

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,36 @@
11
PHONY :=
22
PROJECT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
33

4+
# Colors
5+
NO_COLOR=\033[0m
6+
CYAN=\033[36m
7+
GREEN=\033[0;32m
8+
RED=\033[0;31m
9+
YELLOW=\033[0;33m
10+
11+
ENV := local
12+
413
# Include project env vars (if exists)
514
-include .env
615
-include .env.local
716

8-
# Include druidfi/tools config
9-
include $(PROJECT_DIR)/tools/make/Makefile
17+
define step
18+
@printf "\n⭐ ${YELLOW}${1}${NO_COLOR}\n"
19+
endef
20+
21+
PHONY += help
22+
help: ## List all make commands
23+
$(call step,Available make commands:\n)
24+
@cat $(MAKEFILE_LIST) | grep -e "^[a-zA-Z_\-]*: *.*## *" | awk 'BEGIN {FS = ":.*?## "}; {printf "${CYAN}%-30s${NO_COLOR} %s\n", $$1, $$2}'
1025

11-
# Include project specific make files (if they exist)
12-
-include $(PROJECT_DIR)/tools/make/project/*.mk
26+
# Allow projects to specify makefiles.
27+
-include tools/make/project/*.mk
1328

14-
# Project specific overrides for variables (if they exist)
15-
-include $(PROJECT_DIR)/tools/make/override.mk
29+
include tools/make/docker.mk
30+
include tools/make/composer.mk
31+
include tools/make/drupal.mk
32+
include tools/make/git.mk
33+
include tools/make/theme.mk
34+
include tools/make/qa.mk
1635

1736
.PHONY: $(PHONY)

composer.lock

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conf/cmi/language/sv/block.block.chatleijuke.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

tools/commit-msg

100755100644
File mode changed.

tools/make/Makefile

Lines changed: 0 additions & 46 deletions
This file was deleted.

tools/make/ansible.mk

Lines changed: 0 additions & 35 deletions
This file was deleted.

tools/make/common.mk

Lines changed: 0 additions & 75 deletions
This file was deleted.

tools/make/composer.mk

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
BUILD_TARGETS += composer-install
2-
COMPOSER_PROD_FLAGS := --no-dev --optimize-autoloader --prefer-dist
3-
4-
PHONY += composer-info
5-
composer-info: ## Composer info
6-
$(call step,Do Composer info...\n)
7-
$(call composer,info)
8-
91
PHONY += composer-update
102
composer-update: ## Update Composer packages
113
$(call step,Do Composer update...\n)
@@ -14,19 +6,13 @@ composer-update: ## Update Composer packages
146
PHONY += composer-install
157
composer-install: ## Install Composer packages
168
$(call step,Do Composer install...\n)
17-
$(call composer,install$(if $(filter production,$(ENV)), $(COMPOSER_PROD_FLAGS),))
9+
$(call composer,install)
1810

1911
PHONY += composer-outdated
2012
composer-outdated: ## Show outdated Composer packages
2113
$(call step,Show outdated Composer packages...\n)
2214
$(call composer,outdated --direct)
2315

24-
ifeq ($(RUN_ON),docker)
25-
define composer
26-
$(call docker_compose_exec,composer --ansi$(if $(filter $(COMPOSER_JSON_PATH),.),, --working-dir=$(COMPOSER_JSON_PATH)) $(1))
27-
endef
28-
else
2916
define composer
30-
@composer --ansi$(if $(filter $(COMPOSER_JSON_PATH),.),, --working-dir=$(COMPOSER_JSON_PATH)) $(1)
17+
$(call docker_compose_exec,composer $(1))
3118
endef
32-
endif

0 commit comments

Comments
 (0)