From dd354bc323cd3176c9676444f99b33b69d0a2062 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Sat, 14 May 2022 15:21:52 -0600 Subject: Create srv.dev-shell target in Makefile --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index de7e4f1..f5eadc0 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,20 @@ entrypoint: --arg baseConfig '(import ${CONFIG})' install: - nix-build -A install --arg baseConfig '(import ${CONFIG})' - ./result + $$(nix-build -A install --arg baseConfig '(import ${CONFIG})') test: - $$(nix-build --no-out-link -A pkgs.bash)/bin/bash test.sh - @if [ $$? == 0 ]; then echo "TESTS PASSED!"; else echo "TESTS FAILED!"; fi + $$(nix-build --no-out-link -A pkgs.bash)/bin/bash srv-dev-env.sh \ + --run "cd srv/src && go test ./... -count=1 -tags integration" + @echo "\nTESTS PASSED!\n" + +srv.dev-shell: + $$(nix-build --no-out-link -A pkgs.bash)/bin/bash srv-dev-env.sh \ + --command "cd srv/src; return" srv.shell: - nix-shell -A srv.shell --arg baseConfig '(import ${CONFIG})' \ - --command 'cd srv; return' + nix-shell -A srv.shellWithBuild --arg baseConfig '(import ${CONFIG})' \ + --command 'cd srv/src; return' # TODO static is on the way out, these aren't well supported static.serve: -- cgit v1.2.3