Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
back-2-95 committed Jun 11, 2024
1 parent 0014957 commit ba4de03
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -55,7 +55,7 @@ DOCKER_PROJECT_ROOT := /app

## Example on Makefile in your project root

```
```makefile
PHONY :=
PROJECT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))

Expand Down Expand Up @@ -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
```

Expand Down
2 changes: 0 additions & 2 deletions make/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
3 changes: 0 additions & 3 deletions make/include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ba4de03

Please sign in to comment.