| ... | @@ -181,56 +181,56 @@ Using GitLab and according to the GIT branching and testing strategy introduced |
... | @@ -181,56 +181,56 @@ Using GitLab and according to the GIT branching and testing strategy introduced |
|
|
|
|
|
|
|
```
|
|
```
|
|
|
EITHER from GitLab
|
|
EITHER from GitLab
|
|
|
* Commits -> Branches -> New branch
|
|
- Commits -> Branches -> New branch
|
|
|
* Put name of the new branch and the name of the branch you check off from, in this case 'master'
|
|
- Put name of the new branch and the name of the branch you check off from, in this case 'master'
|
|
|
* Click on "Create branch"
|
|
- Click on "Create branch"
|
|
|
OR from terminal
|
|
OR from terminal
|
|
|
* git fetch origin
|
|
- git fetch origin
|
|
|
* git checkout master
|
|
- git checkout master
|
|
|
* git pull
|
|
- git pull
|
|
|
* git checkout -b branch_name
|
|
- git checkout -b branch_name
|
|
|
```
|
|
```
|
|
|
|
|
|
|
|
3- Perform feature/bugfix commits
|
|
3- Perform feature/bugfix commits
|
|
|
|
|
|
|
|
```
|
|
```
|
|
|
* Open terminal
|
|
- Open terminal
|
|
|
(* git fetch)(only if created from GitLab)
|
|
(- git fetch)(only if created from GitLab)
|
|
|
* Checkout to the new branch
|
|
- Checkout to the new branch
|
|
|
* Make changes
|
|
- Make changes
|
|
|
* Last commit must finish with 'Fixes #issue_number'
|
|
- Last commit must finish with 'Fixes #issue_number'
|
|
|
```
|
|
```
|
|
|
|
|
|
|
|
4- Check that everything is fine
|
|
4- Check that everything is fine
|
|
|
|
|
|
|
|
```
|
|
```
|
|
|
* Run the script /shared/earth/software/scripts/test-s2dverification branch_name. It will do atomatically:
|
|
- Run the script /shared/earth/software/scripts/test-s2dverification branch_name. It will do atomatically:
|
|
|
a) rebase master into the development branch
|
|
a) rebase master into the development branch
|
|
|
b) build the package tarball
|
|
b) build the package tarball
|
|
|
c) check the tarball
|
|
c) check the tarball
|
|
|
* If any error raises during rebase do:
|
|
- If any error raises during rebase do:
|
|
|
git merge --no-ff master
|
|
git merge --no-ff master
|
|
|
fix conflicts
|
|
fix conflicts
|
|
|
commit
|
|
commit
|
|
|
try 4- again
|
|
try 4- again
|
|
|
* If any error raises during build or check:
|
|
- If any error raises during build or check:
|
|
|
build and check manually (follow instructions in wiki in section How to develop > How to build and check manually)
|
|
build and check manually (follow instructions in wiki in section How to develop > How to build and check manually)
|
|
|
fix errors
|
|
fix errors
|
|
|
commit
|
|
commit
|
|
|
try 4- again
|
|
try 4- again
|
|
|
* git push origin HEAD
|
|
- git push origin HEAD
|
|
|
```
|
|
```
|
|
|
|
|
|
|
|
5- Create a merge request
|
|
5- Create a merge request
|
|
|
|
|
|
|
|
```
|
|
```
|
|
|
* Merge Requests -> New Merge Request
|
|
- Merge Requests -> New Merge Request
|
|
|
* Choose origin and destiny
|
|
- Choose origin and destiny
|
|
|
* Click on "Compare branches"
|
|
- Click on "Compare branches"
|
|
|
* Fill in title and description.
|
|
- Fill in title and description.
|
|
|
Description field should contain testers referenced with @tester_name
|
|
Description field should contain testers referenced with @tester_name
|
|
|
If any comment is needed put there
|
|
If any comment is needed put there
|
|
|
Select a milestone for the feature, so that it's associated to a deadline. If there's no associated milestone you can create one or specify a deadline for the feature to be tested in the text
|
|
Select a milestone for the feature, so that it's associated to a deadline. If there's no associated milestone you can create one or specify a deadline for the feature to be tested in the text
|
|
|
* Assign to the project coordinator
|
|
- Assign to the project coordinator
|
|
|
* Click on "Submit merge request"
|
|
- Click on "Submit merge request"
|
|
|
``` |
|
``` |
