This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
сервис_git [2022/08/15 07:01] val [On-Premise gitlab] |
сервис_git [2022/08/16 15:32] val [Пример с тестовой веткой] |
||
---|---|---|---|
Line 198: | Line 198: | ||
==== Пример с тестовой веткой ==== | ==== Пример с тестовой веткой ==== | ||
<code> | <code> | ||
- | $ git branch test | + | λ git branch test |
- | $ git branch -a | + | λ git branch -a |
- | $ git checkout test | + | λ git checkout test |
... edit ... commit ... | ... edit ... commit ... | ||
- | $ git push -u origin test | + | λ git push -u origin test |
+ | |||
+ | root@server:~/openvpn1# git pull origin test | ||
+ | root@server:~/openvpn1# ansible-playbook ... test_nodes | ||
+ | или | ||
... ci/cd test ... | ... ci/cd test ... | ||
- | $ git checkout main | ||
- | $ git push -u origin main | + | λ git checkout main |
+ | |||
+ | λ git merge test | ||
+ | |||
+ | λ git push -u origin main | ||
... ci/cd prod ... | ... ci/cd prod ... |