diff options
| author | Haoran S. Diao <0@hairydiode.xyz> | 2019-01-24 14:14:35 -0500 |
|---|---|---|
| committer | Haoran S. Diao <0@hairydiode.xyz> | 2019-01-24 14:14:35 -0500 |
| commit | 66138630f58b54b577807a21cf80a551d6bbf433 (patch) | |
| tree | 2ebab451b9cba1a688046bec5e0ed4a92e0ff788 | |
| parent | 7fbc5a886723ca8f7547ba80bf8da07417fefc5c (diff) | |
added workflow page
| -rw-r--r-- | cont/csc-workflow.html | 74 | ||||
| -rw-r--r-- | csc-workflow.html | 99 | ||||
| -rw-r--r-- | index.html | 1 |
3 files changed, 174 insertions, 0 deletions
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 @@ +<!-- +123456789-223456789-323456789-423456789-523456789-623456789-723456789-8234567890 +一二三四-->[TITLE] [DATE] +-------------------------------------------------------------------------------- +[SETTITLE]Control Systems Club Project Workflow +[SETDATE]1-24-2019 + +First, create an ssh key. Intructions below: +<a href="https://www.digitalocean.com/community/tutorials/how-to-set-up-ssh-keys--2">SSH Generation Tutorial</a> +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 + + diff --git a/csc-workflow.html b/csc-workflow.html new file mode 100644 index 0000000..8150da4 --- /dev/null +++ b/csc-workflow.html @@ -0,0 +1,99 @@ +<!DOCTYPE html> +<head> +<title>Control Systems Club Project Workflow</title> +<meta charset="utf-8"/> +<link rel="stylesheet" href="https://hairydiode.xyz/style.css"/> +<link rel="icon" type="image/png" href="https://hairydiode.xyz/img/fav/logo.png"/> +</head> +<body> +<div class="content"> +<pre> +<!-- +123456789-223456789-323456789-423456789-523456789-623456789-723456789-8234567890 +一二三四 +-->-------------------------------------------------------------------------------- + +<a href="https://hairydiode.xyz">>HairyDiode</a> + +-------------------------------------------------------------------------------- +<!-- +123456789-223456789-323456789-423456789-523456789-623456789-723456789-8234567890 +一二三四-->Control Systems Club Project Workflow 1-24-2019 +-------------------------------------------------------------------------------- + +First, create an ssh key. Intructions below: +<a href="https://www.digitalocean.com/community/tutorials/how-to-set-up-ssh-keys--2">SSH Generation Tutorial</a> +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 + + +</pre> +</div> +<br> +<br> +</body> +<!-- +if you're digging in the src you might be interested in how this site works +here: https://hairydiode.xyz/meta2 +--> @@ -44,6 +44,7 @@ Where's all the other stuff you host from this domain? <a href="https://social.hairydiode.xyz">My Mastodon Instance</a> Where's all the content? Scroll Down +<a href="https://hairydiode.xyz/csc-workflow">[Control Systems Club Project Workflow] 1-24-2019</a> <a href="https://hairydiode.xyz/csc-new">[Control Systems Club Web Controlled Servo Instructions] 1-24-2019</a> <a href="https://hairydiode.xyz/iokalant">[𘤝𘤞𘤀𘤛・𘤌𘤛𘤧𘤁・𘤊𘤡・𘤈𘤝-Iokalant Writing System-优卡文字系] 1-26-2018</a> <a href="https://hairydiode.xyz/key">[PGP Public Key] 6-26-2018</a> |