rename merge -> deploy

This commit is contained in:
Ladd 2025-12-28 11:34:44 -06:00
parent 6a8bbf8fe9
commit 18869f1027
2 changed files with 17 additions and 1 deletions

2
commit
View File

@ -12,5 +12,5 @@ git checkout dev
git add .
git commit
git push
ssh lentilz 'cd ~/code/gravity-dev && git stash && git pull && git apply stash && npm i'
ssh lentilz 'cd ~/code/gravity-dev && git add . && git stash && git pull && git apply stash && npm i'

16
deploy Executable file
View File

@ -0,0 +1,16 @@
#!/bin/env bash
if [[ $(hostname) != "ladd76" ]]; then
echo >&2 "host $(hostname) != 'ladd76'"
exit 1
fi
set -eo pipefail
git checkout main
git pull
git merge dev
git push
git checkout dev
ssh lentilz 'cd ~/code/gravity-live && git pull'