From ba4de03f916fd3396e4d92ef124d368a8ce8e4df Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 11 Jun 2024 15:01:33 +0300 Subject: [PATCH] Cleanup --- README.md | 8 ++++---- make/Makefile | 2 -- make/include.mk | 3 --- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4cb4fdf..1c45afd 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ You can also add `tools/make/override.mk` to override variables. For example if you want to force certain CLI values for your local setup even if something is autodetected: -``` +```makefile # Custom Docker CLI container CLI_SERVICE := app CLI_USER := druid @@ -55,7 +55,7 @@ DOCKER_PROJECT_ROOT := /app ## Example on Makefile in your project root -``` +```makefile PHONY := PROJECT_DIR := $(dir $(lastword $(MAKEFILE_LIST))) @@ -93,13 +93,13 @@ As one of the operations `make clean` will remove the `vendor` folder. Set Git hook. This will run tests pre-commit and if all is good, then update version. -``` +```console ln -sf ../../hooks/pre-commit .git/hooks/pre-commit ``` Run tests: -```bash +```console make test ``` diff --git a/make/Makefile b/make/Makefile index 740dd60..fa00088 100644 --- a/make/Makefile +++ b/make/Makefile @@ -34,9 +34,7 @@ debug: ## Show debug information $(call dbg,COMPOSER_JSON_EXISTS,${COMPOSER_JSON_EXISTS}) $(call dbg,IS_DRUPAL,${IS_DRUPAL}) $(call dbg,IS_SYMFONY,${IS_SYMFONY}) - $(call dbg,IS_WP,${IS_WP}) $(call dbg,LAGOON,${LAGOON}) - $(call dbg,WODBY,${WODBY}) $(call dbg,SYSTEM,${SYSTEM}) $(call dbg,WEBROOT,${WEBROOT}) $(call dbg,UNAME_S,${UNAME_S}) diff --git a/make/include.mk b/make/include.mk index 3f469ae..de30c41 100644 --- a/make/include.mk +++ b/make/include.mk @@ -36,12 +36,9 @@ endif # LAGOON := $(shell test -f .lagoon.yml && echo yes || echo no) -WODBY := $(shell test -f wodby.yml && echo yes || echo no) ifeq ($(LAGOON),yes) SYSTEM := LAGOON -else ifeq ($(WODBY),yes) - SYSTEM := WODBY else SYSTEM := WHOKNOWS endif