From cbfcd17c770726d9b61a65e02e15a23a4a92da68 Mon Sep 17 00:00:00 2001 From: Stephan Barth Date: Thu, 21 Nov 2024 00:18:23 +0100 Subject: [PATCH 1/4] build(utils/develop-status.pl): Changed output order. --- utils/develop-status.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/develop-status.pl b/utils/develop-status.pl index f67456a9e..9e19ad3c1 100755 --- a/utils/develop-status.pl +++ b/utils/develop-status.pl @@ -75,10 +75,6 @@ my @devs = filesFromDir($develop, [qr((?:[0-9]{4}-[0-9]{2}-[0-9]{2}T)), 1, "File '%fn' does not look like a development dir, skip"], ]); -for my $devStamp(@devs) { - print "+ Development $devStamp found\n"; - devdirInfo($devStamp, "$develop/$devStamp") -} #my $devDir = undef; #opendir($devDir, "$develop") or die "Cannot open develop directory, because: $!"; #while(my $devStamp = readdir($devDir)) { @@ -99,6 +95,11 @@ for my $k(sort { print "Fradrive container outside develop file: ($c->{state}) $c->{name} $c->{id}\n" if $show } +for my $devStamp(@devs) { + print "+ Development $devStamp found\n"; + devdirInfo($devStamp, "$develop/$devStamp") +} + exit 0; sub devdirInfo { From fbc8271e86eca7d6b2c80ee68018c31a56f80c50 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 24 Nov 2024 02:00:43 +0100 Subject: [PATCH 2/4] build(Makefile): set PORT env var on start-backend --- Makefile | 1 + package.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b6b5b04b4..4afb02c10 100644 --- a/Makefile +++ b/Makefile @@ -258,6 +258,7 @@ endif export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \ export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \ export HOST=`hostname -s` ; \ + export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \ export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \ export LOG_ALL=$${LOG_ALL:-false} ; \ export LOGLEVEL=$${LOGLEVEL:-info} ; \ diff --git a/package.yaml b/package.yaml index ec3c48e85..4a0878724 100644 --- a/package.yaml +++ b/package.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Sarah Vaupel +# SPDX-FileCopyrightText: 2023-2024 Sarah Vaupel # # SPDX-License-Identifier: AGPL-3.0-or-later From ebbf52dd15cb44458155c026691a37b795b7c312 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 24 Nov 2024 02:01:02 +0100 Subject: [PATCH 3/4] build(Makefile): switch back to yesod-devel for start-backend --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4afb02c10..f7904ddbb 100644 --- a/Makefile +++ b/Makefile @@ -271,7 +271,7 @@ endif export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \ export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \ export AVSPASS=$${AVSPASS:-nopasswordset} ; \ - ./bin/uniworx + stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}" # HELP(compile-backend): compile backend binaries --compile-backend: stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins From 26831fde6e570e8b619bfe491d07cad42538d9f5 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 25 Nov 2024 16:19:25 +0100 Subject: [PATCH 4/4] build(Makefile): do not compile backend before start --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f7904ddbb..a105940f6 100644 --- a/Makefile +++ b/Makefile @@ -254,7 +254,7 @@ endif fi # HELP(start-backend): start development instance ---start-backend: --compile-backend +--start-backend: export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \ export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \ export HOST=`hostname -s` ; \