From e7ea2e99d579a44438ce0756d0972c909b75a531 Mon Sep 17 00:00:00 2001 From: sonyavpaa Date: Thu, 20 Jun 2024 11:10:57 +0200 Subject: [PATCH 1/3] make cypress-update --- make/Makefile | 1 + make/common.mk | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/make/Makefile b/make/Makefile index fa00088..fa3b358 100644 --- a/make/Makefile +++ b/make/Makefile @@ -9,6 +9,7 @@ RUN_ON := host UNAME_S := $(shell uname -s) # Shorten with https://git.io/ : https://raw.githubusercontent.com/druidfi/tools/main/update.sh UPDATE_SCRIPT_URL := https://git.io/JP10q +UPDATE_CYPRESS_SCRIPT_URL := https://raw.githubusercontent.com/druidfi/cypress-testing/updater/update.sh WEBROOT ?= public include $(DRUIDFI_TOOLS_MAKE_DIR)utils.mk diff --git a/make/common.mk b/make/common.mk index 0ede445..2bb32dc 100644 --- a/make/common.mk +++ b/make/common.mk @@ -45,6 +45,11 @@ clean: ## Cleanup @rm -rf vendor @git clean -fdx $(foreach item,$(CLEAN_EXCLUDE),-e $(item)) +PHONY += cypress-update +cypress-update: ## Update Cypress from druidfi/cypress-testing + $(call step,Update Cypress...\n) + @bash -c "$$(curl -fsSL $(UPDATE_CYPRESS_SCRIPT_URL))" + PHONY += self-update self-update: ## Self-update makefiles from druidfi/tools $(call step,Update makefiles from druidfi/tools\n) From 553c7f6be946a7a1ac5254afb4631f54f89b97df Mon Sep 17 00:00:00 2001 From: sonyavpaa Date: Mon, 24 Jun 2024 09:11:10 +0200 Subject: [PATCH 2/3] Change UPDATE_CYPRESS_SCRIPT_URL to come from main branch. --- make/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/Makefile b/make/Makefile index fa3b358..804a30e 100644 --- a/make/Makefile +++ b/make/Makefile @@ -9,7 +9,7 @@ RUN_ON := host UNAME_S := $(shell uname -s) # Shorten with https://git.io/ : https://raw.githubusercontent.com/druidfi/tools/main/update.sh UPDATE_SCRIPT_URL := https://git.io/JP10q -UPDATE_CYPRESS_SCRIPT_URL := https://raw.githubusercontent.com/druidfi/cypress-testing/updater/update.sh +UPDATE_CYPRESS_SCRIPT_URL := https://raw.githubusercontent.com/druidfi/cypress-testing/main/update.sh WEBROOT ?= public include $(DRUIDFI_TOOLS_MAKE_DIR)utils.mk From 48e3a56465cda97dea5c5cd8acfbc2861ec697ac Mon Sep 17 00:00:00 2001 From: sonyavpaa Date: Mon, 24 Jun 2024 10:01:55 +0200 Subject: [PATCH 3/3] Moved make cypress-update and url related to it to qa.mk. --- make/Makefile | 1 - make/common.mk | 5 ----- make/qa.mk | 6 ++++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/make/Makefile b/make/Makefile index 804a30e..fa00088 100644 --- a/make/Makefile +++ b/make/Makefile @@ -9,7 +9,6 @@ RUN_ON := host UNAME_S := $(shell uname -s) # Shorten with https://git.io/ : https://raw.githubusercontent.com/druidfi/tools/main/update.sh UPDATE_SCRIPT_URL := https://git.io/JP10q -UPDATE_CYPRESS_SCRIPT_URL := https://raw.githubusercontent.com/druidfi/cypress-testing/main/update.sh WEBROOT ?= public include $(DRUIDFI_TOOLS_MAKE_DIR)utils.mk diff --git a/make/common.mk b/make/common.mk index 2bb32dc..0ede445 100644 --- a/make/common.mk +++ b/make/common.mk @@ -45,11 +45,6 @@ clean: ## Cleanup @rm -rf vendor @git clean -fdx $(foreach item,$(CLEAN_EXCLUDE),-e $(item)) -PHONY += cypress-update -cypress-update: ## Update Cypress from druidfi/cypress-testing - $(call step,Update Cypress...\n) - @bash -c "$$(curl -fsSL $(UPDATE_CYPRESS_SCRIPT_URL))" - PHONY += self-update self-update: ## Self-update makefiles from druidfi/tools $(call step,Update makefiles from druidfi/tools\n) diff --git a/make/qa.mk b/make/qa.mk index f4988fb..a2e447a 100644 --- a/make/qa.mk +++ b/make/qa.mk @@ -4,6 +4,12 @@ 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 +UPDATE_CYPRESS_SCRIPT_URL := https://raw.githubusercontent.com/druidfi/cypress-testing/main/update.sh + +PHONY += cypress-update +cypress-update: ## Update Cypress from druidfi/cypress-testing + $(call step,Update Cypress...\n) + @bash -c "$$(curl -fsSL $(UPDATE_CYPRESS_SCRIPT_URL))" PHONY += fix fix: ## Fix code style