david/uno-q-audio-synth
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: git stash before deploy, no pop (discard board changes)
Validate and Test / validate-patches (push) Failing after 12s
Details

Browse Source 
- just deploy: stash local board changes before git pull
- install.sh: configure git alias 'pull-clean' for manual use
- Board-side changes from test edits are discarded on deploy
This commit is contained in:
David Gwilliam
2026-06-24 04:27:21 -07:00
parent 014682e509
commit 94614bf774
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.sh
+2
View File
@@ -29,5 +29,7 @@ done
# Install git hooks: point to repo's .githooks so post-merge auto-restarts services # Install git hooks: point to repo's .githooks so post-merge auto-restarts services
git config core.hooksPath "$REPO/.githooks" git config core.hooksPath "$REPO/.githooks"
# Add pull-clean alias: stash local changes, pull fresh, discard stashed
git config alias.pull-clean '!git stash && git pull'
echo "[OK] Services installed and enabled" echo "[OK] Services installed and enabled"
justfile
+1 -1
View File
@@ -101,7 +101,7 @@ install:
deploy: deploy:
@git push origin HEAD 2>&1 @git push origin HEAD 2>&1
@ssh {{SSH_OPTS}} "{{BOARD_USER}}@{{BOARD_HOST}}" "\ @ssh {{SSH_OPTS}} "{{BOARD_USER}}@{{BOARD_HOST}}" "\
cd {{REPO_DIR}} && git pull && \ cd {{REPO_DIR}} && git stash && git pull && \
git config core.hooksPath .githooks && \ git config core.hooksPath .githooks && \
chmod +x scripts/*.py scripts/*.sh 2>/dev/null; \ chmod +x scripts/*.py scripts/*.sh 2>/dev/null; \
echo '{{BOARD_PASS}}' | sudo -S systemctl daemon-reload && \ echo '{{BOARD_PASS}}' | sudo -S systemctl daemon-reload && \