wiki.chpc.ac.za

User Tools

Site Tools

You are here: start » quick » gitlab_setup
Trace:
quick:gitlab_setup

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
quick:gitlab_setup [2024/10/21 09:07]
bbarsch removed 		— (current)
Line 1: Line 1:
-====== Procedure to update user db code ====== 
- 
- 
-===== Clone the userdb code from the Gitlab Repo===== 
-1. Go to the directory you want to clone the repo to 
- 
- 
-2. Go to the repo in Gitlab and copy the ssh link: 
-<code> 
-git@git:protea/protea_database.git 
-</code> 
- 
-3. Note that git should be pointing to scp and not lengau, therefore in my .ssh/config file git2 points to scp so I use ''git clone git@git2:protea/protea_database.git'': 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb 
-$ git clone git@git2:protea/protea_database.git 
-Cloning into 'protea_database'... 
-Enter passphrase for key '/c/Users/BBarsch/.ssh/id_dsa': 
-remote: Enumerating objects: 425, done. 
- 
-</code> 
- 
-Passphrase was Csir20... 
- 
- 
-4. Open your IDE, using sublime, and make changes to the code. 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb 
-$ cd protea_database/ 
- 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ 
- 
-</code> 
- 
-5. Save the code and check the ''git status'' to make sure you are up-to-date: 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ git status 
-On branch master 
-Your branch is up to date with 'origin/master'. 
- 
-nothing to commit, working tree clean 
- 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ 
- 
-</code> 
- 
- 
- 
-6. Next step is to push the code 
- 
-===== Push the code back to Gitlab - Master ===== 
- 
-1. Update, add, delete code and files. For demonstration we will just modify the README.md text for example. 
-Then go to that directory you did the clone from and hence the update and say ''git status'': 
-   
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ git status 
-On branch master 
-Your branch is up to date with 'origin/master'. 
- 
-Changes not staged for commit: 
-  (use "git add <file>..." to update what will be committed) 
-  (use "git restore <file>..." to discard changes in working directory) 
-        modified:   README.md 
- 
-no changes added to commit (use "git add" and/or "git commit -a") 
- 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ 
- 
- 
-</code> 
- 
-2. this should show something is modified, and recommends you do ''git add .'' or ''git add <filename>'': 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ git add README.md 
- 
-</code> 
- 
-4. Then do a commit ''git commit -m "commit comment"'': 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ git commit -m "18-Feb-2021 Test Commit" 
-[master b7ea92ab] 18-Feb-2021 Test Commit 
- 1 file changed, 3 insertions(+) 
- 
- 
-</code> 
- 
- 
-5. And check with git status again that it has been added 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ git status 
-On branch master 
-Your branch is ahead of 'origin/master' by 1 commit. 
-  (use "git push" to publish your local commits) 
- 
-nothing to commit, working tree clean 
-</code> 
- 
- 
-6. Then lastly push the code to gitlab use ''git push'': 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ git push 
-Enter passphrase for key '/c/Users/BBarsch/.ssh/id_dsa': 
-Enumerating objects: 5, done. 
-Counting objects: 100% (5/5), done. 
-Delta compression using up to 12 threads 
-Compressing objects: 100% (3/3), done. 
-Writing objects: 100% (3/3), 323 bytes | 161.00 KiB/s, done. 
-Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 
-To git2:protea/protea_database.git 
-   b205ea3d..b7ea92ab  master -> master 
- 
- 
- 
-</code> 
-   
- 
-maybe asked for a passphrase, use ''Csir20...'' as its done through ''users.chpc'' or ''bio.chpc''. Not sure if you can do this without a password as ssh-copy-id did not make a difference. 
- 
-Next we need to update the user database 
- 
-===== Push the code back to Gitlab - "Branch" ===== 
-1. Update, add, delete code and files. For demonstration we will just modify the README.md text for example. Now change to another branch by using ''git checkout -b bb_new_branch'': 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (master) 
-$ git checkout -b bb_new_branch 
-Switched to a new branch 'bb_new_branch' 
- 
-</code> 
- 
-2. Now check your status: 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (bb_new_branch) 
-$ git status 
-On branch bb_new_branch 
-Changes not staged for commit: 
-  (use "git add <file>..." to update what will be committed) 
-  (use "git restore <file>..." to discard changes in working directory) 
-        modified:   README.md 
- 
-no changes added to commit (use "git add" and/or "git commit -a") 
- 
- 
-</code> 
- 
-3. Now add ''README.md'' and check the status: 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (bb_new_branch) 
-$ git add README.md 
- 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (bb_new_branch) 
-$ git status 
-On branch bb_new_branch 
-Changes to be committed: 
-  (use "git restore --staged <file>..." to unstage) 
-        modified:   README.md 
- 
- 
-</code> 
- 
-4. Then make the commit: 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (bb_new_branch) 
-$ git commit -m "Test push" 
-[bb_new_branch 785e724a] Test push 
- 1 file changed, 3 insertions(+) 
- 
- 
-</code> 
- 
-5. Then push the code: 
- 
-<code> 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (bb_new_branch) 
-$ git push 
-fatal: The current branch bb_new_branch has no upstream branch. 
-To push the current branch and set the remote as upstream, use 
- 
-    git push --set-upstream origin bb_new_branch 
- 
-</code> 
- 
-6. Note this is different to how you do it with ''master'' you have to ''upstream'': 
- 
-<code> 
- 
-BBarsch@BBARSCH-NB1 MINGW64 /d/CSIR_Dev/git_userdb/protea_database (bb_new_branch) 
-$ git push --set-upstream origin bb_new_branch 
-Enter passphrase for key '/c/Users/BBarsch/.ssh/id_dsa': 
-Enumerating objects: 5, done. 
-Counting objects: 100% (5/5), done. 
-Delta compression using up to 12 threads 
-Compressing objects: 100% (3/3), done. 
-Writing objects: 100% (3/3), 311 bytes | 311.00 KiB/s, done. 
-Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 
-remote: 
-remote: To create a merge request for bb_new_branch, visit: 
-remote:   http://git.chpc.ac.za/protea/protea_database/-/merge_requests/new?merge_request%5Bsource_branch%5D=bb_new_branch 
-remote: 
-To git2:protea/protea_database.git 
- * [new branch]        bb_new_branch -> bb_new_branch 
-Branch 'bb_new_branch' set up to track remote branch 'bb_new_branch' from 'origin'. 
- 
- 
-</code> 
- 
-Now when you try to merge on Gitlab: 
- 
-{{quick:merge_req.png}} 
- 
  
/app/dokuwiki/data/attic/quick/gitlab_setup.1729494424.txt.gz · Last modified: 2024/10/21 09:07 by bbarsch

Page Tools

Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Noncommercial-Share Alike 3.0 Unported
CC Attribution-Noncommercial-Share Alike 3.0 Unported Donate Powered by PHP Valid HTML5 Valid CSS Driven by DokuWiki