diff options
| author | Haoran S. Diao (刁浩然) <0@hairydiode.xyz> | 2025-09-06 16:37:54 -0700 |
|---|---|---|
| committer | Haoran S. Diao (刁浩然) <0@hairydiode.xyz> | 2025-09-06 16:37:54 -0700 |
| commit | 9e6bca0b2fadeb55d55a27329a72e03b31d9998d (patch) | |
| tree | 568830dea73aecf4368f7734ff942d640d373bb7 /csc-workflow.html | |
| parent | 17cdd8ef364502897fcd5e6418ec36ab2f5e4dc9 (diff) | |
All the sites
Diffstat (limited to 'csc-workflow.html')
| -rw-r--r-- | csc-workflow.html | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/csc-workflow.html b/csc-workflow.html new file mode 100644 index 0000000..bd6db5f --- /dev/null +++ b/csc-workflow.html @@ -0,0 +1,109 @@ +<!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 git@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: + arduino-devel + frontend-devel + backend-devel + controller-devel + +1.5. Set the upstream of your branch to sync to that branch on the git server. + +git branch --set-upstream-to origin/$branch + +2. Make the changes you want to make, and commit them. + +type "git branch" to make sure you're on the development branch. + +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. + +Push your changes to the remote repository running on ryugyong + +git push + +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 +--> |