mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 11:01:04 +00:00
Code Issues Projects Releases Wiki Activity

Run php and yarn from Docker container if it's running

Browse source
This commit is contained in:
Yassine Guedidi 2024-11-18 23:53:54 +01:00
parent 01b503d1da
commit 6f40edb1c7
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/CONTRIBUTING.md vendored
View file

@ -50,11 +50,7 @@ Please fork wallabag and work with **the master branch**.
All pull requests need to pass the tests and the code needs match the style guide. All pull requests need to pass the tests and the code needs match the style guide.
To run the tests locally run: To run the tests locally run `make test`.
- when testing using Docker: `docker-compose run --rm php bin/phpunit` (or `docker-compose run --rm php make test` if you
prefer using `make`)
- otherwise: `bin/phpunit` (or `make test`)
To run the PHP formatter: To run the PHP formatter:

20
GNUmakefile
View file

@ -11,6 +11,18 @@ else
override ENV = prod override ENV = prod
endif endif
DOCKER_COMPOSE_RUNNING := $(shell docker-compose ps -q | grep -q . && echo 1 || echo 0)
ifeq ($(DOCKER_COMPOSE_RUNNING), 1)
PHP := docker compose run --rm php php
PHP_NO_XDEBUG := docker compose run -e XDEBUG_MODE=off --rm php php
YARN := docker compose run --rm php yarn
else
PHP := php
PHP_NO_XDEBUG := XDEBUG_MODE=off php
YARN := yarn
endif
help: ## Display this help menu help: ## Display this help menu
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@ -25,14 +37,14 @@ dev: build ## Install the latest dev version
@./scripts/dev.sh @./scripts/dev.sh
run: ## Run the wallabag built-in server run: ## Run the wallabag built-in server
@php bin/console server:run --env=dev @$(PHP) bin/console server:run --env=dev
build: ## Run webpack build: ## Run webpack
@yarn install @$(YARN) install
@yarn build:$(ENV) @$(YARN) build:$(ENV)
test: ## Launch wallabag testsuite test: ## Launch wallabag testsuite
@XDEBUG_MODE=off php -dmemory_limit=-1 bin/phpunit -v @$(PHP_NO_XDEBUG) -dmemory_limit=-1 bin/phpunit -v
release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
ifndef VERSION ifndef VERSION