From e9731f0572b052f23f335b57ec3ddc3650f62098 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Wed, 19 Jun 2019 17:20:13 -0700 Subject: [PATCH] Also move the make targets to the root --- GNUmakefile | 15 +++++++++++++++ website/Makefile | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index d51951b5681..2168ed8de90 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -355,3 +355,18 @@ help: ## Display this usage information @echo "" @echo "This host will build the following targets if 'make release' is invoked:" @echo $(ALL_TARGETS) | sed 's/^/ /' + +ui-screenshots: + @echo "==> Collecting UI screenshots..." + # Build the screenshots image if it doesn't exist yet + @if [[ "$$(docker images -q nomad-ui-screenshots 2> /dev/null)" == "" ]]; then \ + docker build --tag="nomad-ui-screenshots" ./scripts/screenshots; \ + fi + @docker run \ + --rm \ + --volume "$(shell pwd)/scripts/screenshots/screenshots:/screenshots" \ + nomad-ui-screenshots + +ui-screenshots-local: + @echo "==> Collecting UI screenshots (local)..." + @cd scripts/screenshots/src && SCREENSHOTS_DIR="../screenshots" node index.js \ No newline at end of file diff --git a/website/Makefile b/website/Makefile index 6649997c380..39ba4ce91e3 100644 --- a/website/Makefile +++ b/website/Makefile @@ -26,19 +26,4 @@ test: @echo "==> Running website tests..." ./scripts/test.sh ${VERSION} -ui-screenshots: - @echo "==> Collecting UI screenshots..." - # Build the screenshots image if it doesn't exist yet - @if [[ "$$(docker images -q nomad-ui-screenshots 2> /dev/null)" == "" ]]; then \ - docker build --tag="nomad-ui-screenshots" ./scripts/screenshots; \ - fi - @docker run \ - --rm \ - --volume "$(shell pwd)/scripts/screenshots/screenshots:/screenshots" \ - nomad-ui-screenshots - -ui-screenshots-local: - @echo "==> Collecting UI screenshots (local)..." - @cd scripts/screenshots/src && SCREENSHOTS_DIR="../screenshots" node index.js - .PHONY: build website