Skip to content

Commit

Permalink
Merge pull request #3841 from owid/larsyencken/fix-tmux-session
Browse files Browse the repository at this point in the history
Fix tmux session handling in Makefile
  • Loading branch information
larsyencken authored Aug 2, 2024
2 parents 9b055dc + f45b0b1 commit bacc2c3
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ up: export DEBUG = 'knex:query'
up: require create-if-missing.env ../owid-content tmp-downloads/owid_metadata.sql.gz node_modules
@make validate.env
@make check-port-3306

@if tmux has-session -t grapher 2>/dev/null; then \
echo '==> Killing existing tmux session'; \
tmux kill-session -t grapher; \
fi

@echo '==> Building grapher'
yarn lerna run build

Expand Down Expand Up @@ -97,6 +103,11 @@ up.full: require create-if-missing.env.full ../owid-content tmp-downloads/owid_m
@make validate.env.full
@make check-port-3306

@if tmux has-session -t grapher 2>/dev/null; then \
echo '==> Killing existing tmux session'; \
tmux kill-session -t grapher; \
fi

@echo '==> Building grapher'
yarn lerna run build

Expand Down Expand Up @@ -299,4 +310,4 @@ local-bake: itsJustJavascript
yarn buildLocalBake

clean:
rm -rf node_modules itsJustJavascript
rm -rf node_modules itsJustJavascript

0 comments on commit bacc2c3

Please sign in to comment.