If we run into merge conflicts or other issues, the objective is to bring the current origin/main
and production/production
branches to the latest on the local machine. We will be merging main into production, overwriting any React or JS but keeping the production config files intact. Then we will push the production branch to the production git remote, pull the same branch from the server. npm run build
, and restart the web service.
Merge changes to utensil:main
, and if necessary, vis-network:main
If vis-network has changed, push main branch
$ git push -u origin main
$ git fetch –all
$ git checkout main
$ git pull
If you have not already added the utensil-prod
remote.
$ git remote add production [email protected]:dryad/utensil-prod.git
$ git fetch --all
Git checkout remote branch production
from utensil-prod
repo if it's not already on the local machine.
$ git checkout -b production production/production
Merge main branch into production branch
$ git merge main
$ git push -u utensil-prod production
Note: This can be skipped if there were no updates to vis-network since the last deployment
SSH with ssh key as ‘django’ user to the server and run:
$ cd vis-network
$ git pull
$ export NODE_OPTIONS="--max-old-space-size=1024"
$ npm run build
$ ssh with ssh key as ‘django’ user
$ cd utensil
$ git pull
$ export NODE_OPTIONS="--max-old-space-size=1024"
$ npm run build
$ PID=$(systemctl show --value -p MainPID gunicorn.service) && kill -HUP $PID