Skip to content

Commit 41b043a

Browse files
authored
Merge pull request #821 from sir-gon/develop
Develop
2 parents e6cd190 + 002d4ba commit 41b043a

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

Makefile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ DOCKER_COMPOSE=docker compose
3232
.PHONY: all clean dependencies help list test outdated
3333
.EXPORT_ALL_VARIABLES: # (2)
3434

35+
define crono
36+
@start=$$(date +%s); \
37+
$(1); \
38+
end=$$(date +%s); \
39+
diff=$$((end - start)); \
40+
printf "Total time: %02d:%02d:%02d\n" $$((diff/3600)) $$((diff%3600/60)) $$((diff%60))
41+
endef
42+
43+
3544
help: list
3645

3746
list:
@@ -126,7 +135,8 @@ compose/test: compose/build
126135
compose/run: compose/build
127136
${DOCKER_COMPOSE} --profile production run --rm algorithm-exercises-ts make run
128137

129-
all: env dependencies test
138+
all:
139+
$(call crono, make clean; make dependencies; make build; make test; make lint; make coverage/html)
130140

131141
run:
132142
ls -alh

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"start": "npm run test",
4040
"lint": "npx eslint --env-info; npx eslint . --color --max-warnings=0 && echo '✔ Your code looks good.'",
4141
"jest:ci": "cross-env NODE_OPTIONS=--experimental-vm-modules npx jest --no-cache --ci --color --detectOpenHandles --forceExit --runInBand --debug",
42-
"jest:clean": "npx jest --clearCache && npx watchman watch-del-all",
42+
"jest:clean": "npx --yes jest --clearCache && npx watchman watch-del-all",
4343
"jest:bruteforce": "cross-env BRUTEFORCE=true NODE_OPTIONS=--experimental-vm-modules npx jest --no-cache --ci --color --detectOpenHandles --forceExit --runInBand --debug",
4444
"jest:watch": "cross-env NODE_OPTIONS=--experimental-vm-modules npx jest --no-cache --ci --color --detectOpenHandles --forceExit --runInBand --debug --watchAll",
4545
"style:format": "npx prettier --write 'src/**/*.ts'",

0 commit comments

Comments
 (0)