m038/natascha-rieter-nl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename deploy/pull-content to content-push/content-pull

Browse Source
This commit is contained in:
Mischa
2026-06-13 20:29:28 +02:00
parent 59f8795670
commit 8154628101
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -3
View File
@@ -13,11 +13,11 @@ setup: start install-plugins
install-plugins: install-plugins:
docker exec natascha_grav php /app/www/public/bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y docker exec natascha_grav php /app/www/public/bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y
# User repo # Content (user repo)
deploy: content-push:
git subtree push --prefix=user user-deploy main git subtree push --prefix=user user-deploy main
pull-content: content-pull:
git subtree pull --prefix=user user-deploy main --squash git subtree pull --prefix=user user-deploy main --squash
# Server # Server
README.md
+2 -2
View File
@@ -68,8 +68,8 @@ This SSHes into the server and runs `scripts/server-install.sh`, which installs
### Deploying changes ### Deploying changes
``` ```
make deploy # push local user/ changes to the user repo on Gitea make content-push # push local user/ changes to the user repo on Gitea
make pull-content # pull editor's content changes back locally make content-pull # pull editor's content changes back locally
``` ```
After `make deploy`, the Git Sync plugin on the server pulls the changes automatically via webhook. After `make deploy`, the Git Sync plugin on the server pulls the changes automatically via webhook.