Merge pull request #822 from City-of-Helsinki/dev

Dev to main

.github/workflows/test.yml

@@ -6,3 +6,5 @@ name: CI
 jobs:
   tests:
     uses: city-of-helsinki/drupal-gh-actions/.github/workflows/project-tests.yml@main
+    secrets:
+      sonarcloud_token: ${{ secrets.SONAR_TOKEN }}

.platform/schema

@@ -1 +1 @@
-14
+15

Makefile

@@ -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)