From 66138630f58b54b577807a21cf80a551d6bbf433 Mon Sep 17 00:00:00 2001 From: "Haoran S. Diao" <0@hairydiode.xyz> Date: Thu, 24 Jan 2019 14:14:35 -0500 Subject: added workflow page --- cont/csc-workflow.html | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 cont/csc-workflow.html (limited to 'cont') diff --git a/cont/csc-workflow.html b/cont/csc-workflow.html new file mode 100644 index 0000000..3f27411 --- /dev/null +++ b/cont/csc-workflow.html @@ -0,0 +1,74 @@ +[TITLE] [DATE] +-------------------------------------------------------------------------------- +[SETTITLE]Control Systems Club Project Workflow +[SETDATE]1-24-2019 + +First, create an ssh key. Intructions below: +SSH Generation Tutorial +Email me "~/.ssh/id_rsa.pub", I will give you permission to the SSH server and +to the production environment. + +In the meantime, clone the code repository from our server "ryugyong" at +public IP 157.230.168.203. + +To do this, run the command + +git clone ssh@157.230.168.203:csc-code + +This will clone a repository named "csc-code" + +1. Go into the repository, and checkout to the development branch. Use: + +git checkout $branch + +where $branch could be: + arduinp-devel + frontend-devel + backend-devel + controller-devel + +2. Make the changes you want to make, and commit them. + +git commit $file + +where file is the file you have changed, if it is new run + +git add $file + +3. Afterwards, ask for a code review from me or somebody else. + +if the code passes review, I will merge it with master. + +4. Put the code into production + +To put these changes into production on the server, ssh into ryugyong with + + ssh root@157.230.168.203 + cd ~/csc-code + git pull + cd backend; make + ./backend + +To put these changes into production on the control computer, physically go to +the control computer and run: + + cd ~/csc-code + git pull + cd controller; make + ./controller + +To put these changes into production on the arduino, Take the arduino to your +computer. + + git checkout master + git pull + + Run Arduino IDE and flash the code onto the Arduino + + git checkout $branch + +5. GOTO 1 + + -- cgit v1.1