Merge pull request #270 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Aug 30, 2023 · 66bec7a · 66bec7a
2 parents fb0f16d + af71cee
commit 66bec7a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/system.action.user_add_role_action.super_administrator.yml b/conf/cmi/system.action.user_add_role_action.super_administrator.yml
@@ -1,4 +1,4 @@
-uuid: c4e2d7dd-ad67-4fd7-8927-98afab20b0af
+uuid: 2b95b2a4-0870-428d-abc3-ad9cd61f0a13
 langcode: en
 status: true
 dependencies:

diff --git a/conf/cmi/system.action.user_remove_role_action.super_administrator.yml b/conf/cmi/system.action.user_remove_role_action.super_administrator.yml
@@ -1,4 +1,4 @@
-uuid: 06a78014-a245-4ed4-a8e6-a491e5eb353c
+uuid: 08b1148b-0347-4ab1-a90c-ccebd014ccda
 langcode: en
 status: true
 dependencies:

diff --git a/conf/cmi/user.role.super_administrator.yml b/conf/cmi/user.role.super_administrator.yml
@@ -1,4 +1,4 @@
-uuid: 548afcec-fc69-4de4-9f77-0b592b912d1b
+uuid: e31b049d-2c54-4762-87df-6123d039aec2
 langcode: en
 status: true
 dependencies: {  }

diff --git a/tools/make/qa.mk b/tools/make/qa.mk
@@ -2,6 +2,7 @@ TEST_TARGETS += test-phpunit
 FIX_TARGETS :=
 LINT_PHP_TARGETS :=
 CS_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/phpcs && echo yes || echo no)
+CS_CONF_EXISTS := $(shell test -f phpcs.xml.dist && echo yes || echo no)
 TESTSUITES ?= unit,kernel,functional
 
 PHONY += fix
@@ -57,10 +58,13 @@ define test_result
 	@echo "\n${YELLOW}${1}:${NO_COLOR} ${GREEN}${2}${NO_COLOR}"
 endef
 
-ifeq ($(CS_INSTALLED),yes)
+ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-yes)
 define cs
-$(call docker_compose_exec,vendor/bin/$(1) --config-set installed_paths $(CS_STANDARD_PATHS))
-$(call docker_compose_exec,vendor/bin/$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2))
+$(call docker_compose_exec,$(1))
+endef
+else ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-no)
+define cs
+$(call docker_compose_exec,$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2))
 endef
 else
 define cs