These instructions describe how to perform the weekly merge of team
members' local git repositories into the shared master branch and push
the updates to production for both the Rust backend server and the React
frontend.
Backend (Rust / Axum / SeaORM)
Local directory: /opt/server_generic_live
Remote: server_generic
Frontend (React.js / Tailwind)
Local directory: /opt/server_frontend_live
Remote: server_frontend
Both repositories are automatically copied to the corresponding
/opt/..._live directories upon push to their remotes. Once copied, the
new version becomes active.
Each developer should ensure their local working branch is
up-to-date before the merge.
cd /path/to/server_generic # or /path/to/server_frontend
git fetch origin
git checkout my-feature-branch
git rebase origin/master # or git merge origin/master
Test locally:
cargo build # backend
npm run build # frontend
git checkout master
git merge my-feature-branch
git push origin master
master.server_generic or server_frontend automatically/opt/..._live and activates.\systemctl status or restart if needed.