Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic update #459

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Automatic update #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .platform/schema
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
15
31 changes: 25 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,36 @@
PHONY :=
PROJECT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))

# Colors
NO_COLOR=\033[0m
CYAN=\033[36m
GREEN=\033[0;32m
RED=\033[0;31m
YELLOW=\033[0;33m

ENV := local

# Include project env vars (if exists)
-include .env
-include .env.local

# Include druidfi/tools config
include $(PROJECT_DIR)/tools/make/Makefile
define step
@printf "\n⭐ ${YELLOW}${1}${NO_COLOR}\n"
endef

PHONY += help
help: ## List all make commands
$(call step,Available make commands:\n)
@cat $(MAKEFILE_LIST) | grep -e "^[a-zA-Z_\-]*: *.*## *" | awk 'BEGIN {FS = ":.*?## "}; {printf "${CYAN}%-30s${NO_COLOR} %s\n", $$1, $$2}'

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

# Project specific overrides for variables (if they exist)
-include $(PROJECT_DIR)/tools/make/override.mk
include tools/make/docker.mk
include tools/make/composer.mk
include tools/make/drupal.mk
include tools/make/git.mk
include tools/make/theme.mk
include tools/make/qa.mk

.PHONY: $(PHONY)
46 changes: 23 additions & 23 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified tools/commit-msg
100755 → 100644
View file
Open in desktop
Empty file.
46 changes: 0 additions & 46 deletions tools/make/Makefile
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions tools/make/ansible.mk
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions tools/make/common.mk
View file
Open in desktop

This file was deleted.

18 changes: 2 additions & 16 deletions tools/make/composer.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
BUILD_TARGETS += composer-install
COMPOSER_PROD_FLAGS := --no-dev --optimize-autoloader --prefer-dist

PHONY += composer-info
composer-info: ## Composer info
$(call step,Do Composer info...\n)
$(call composer,info)

PHONY += composer-update
composer-update: ## Update Composer packages
$(call step,Do Composer update...\n)
Expand All @@ -14,19 +6,13 @@ composer-update: ## Update Composer packages
PHONY += composer-install
composer-install: ## Install Composer packages
$(call step,Do Composer install...\n)
$(call composer,install$(if $(filter production,$(ENV)), $(COMPOSER_PROD_FLAGS),))
$(call composer,install)

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

ifeq ($(RUN_ON),docker)
define composer
$(call docker_compose_exec,composer --ansi$(if $(filter $(COMPOSER_JSON_PATH),.),, --working-dir=$(COMPOSER_JSON_PATH)) $(1))
endef
else
define composer
@composer --ansi$(if $(filter $(COMPOSER_JSON_PATH),.),, --working-dir=$(COMPOSER_JSON_PATH)) $(1)
$(call docker_compose_exec,composer $(1))
endef
endif
Loading
Loading