From 7ff0f7be4890ffd5d6af614fcade3d64eaa66ffc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 8 May 2020 01:00:50 +0200 Subject: [PATCH] Improve makefile recipes --- nixops/Makefile | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/nixops/Makefile b/nixops/Makefile index e52e973..c521682 100644 --- a/nixops/Makefile +++ b/nixops/Makefile @@ -27,11 +27,16 @@ setup: .PHONY: setup ###### Nixops regular tasks +TARGET ?= NIXOPS_ARGS ?= +ifdef TARGET + override NIXOPS_ARGS +=--include=$(TARGET) +endif +SSH_ARGS ?= + nixops: $(NIXOPS_PRIV) $(NIXOPS_ARGS) -SSH_ARGS ?= ssh-eldiron: $(NIXOPS_PRIV) ssh eldiron -- $(SSH_ARGS) @@ -49,25 +54,25 @@ info: $(NIXOPS_PRIV) info debug: - $(NIXOPS_PRIV) deploy --build-only --show-trace + $(NIXOPS_PRIV) deploy --build-only --show-trace $(NIXOPS_ARGS) dry-run: - $(NIXOPS_PRIV) deploy --dry-run + $(NIXOPS_PRIV) deploy --dry-run $(NIXOPS_ARGS) build: - $(NIXOPS_PRIV) deploy --build-only --max-jobs 1 + $(NIXOPS_PRIV) deploy --build-only $(NIXOPS_ARGS) upload: - $(NIXOPS_PRIV) deploy --copy-only + $(NIXOPS_PRIV) deploy --copy-only $(NIXOPS_ARGS) deploy: - $(NIXOPS_PRIV) deploy + $(NIXOPS_PRIV) deploy $(NIXOPS_ARGS) deploy-reboot: - $(NIXOPS_PRIV) deploy --force-reboot + $(NIXOPS_PRIV) deploy --force-reboot $(NIXOPS_ARGS) reboot: - $(NIXOPS_PRIV) reboot --include=eldiron + $(NIXOPS_PRIV) reboot --include=$(TARGET) .PHONY: nixops ssh-eldiron info debug dry-run build upload deploy deploy-reboot reboot ###### Cleanup generations and garbage collection -- 2.41.0