1. Open the bash terminal for Git (for Windows download here: https://git-scm.com/download/win)

2. Navigate to any VIVO directory, for example :
VIVO-Trad-ecosysteme/GIT/Vitro

3. check to make sure the repository is up to date using 'git fetch':


Sacha@Sacha-XPS MINGW64 /c/VIVO-Trad-ecosysteme/GIT/Vitro (sprint-i18n)
$ git fetch




4. Checkout the master branch:


Sacha@Sacha-XPS MINGW64 /c/VIVO-Trad-ecosysteme/GIT/Vitro (sprint-i18n)
$ git checkout --track origin/master
Switched to a new branch 'master'
Branch 'master' set up to track remote branch 'master' from 'origin'.




5. Edit the .git/config file for each of the following directories.
/c/VIVO-Trad-ecosysteme/GIT/Vitro
/c/VIVO-Trad-ecosysteme/GIT/Vitro-languages
/c/VIVO-Trad-ecosysteme/GIT/Vivo
/c/VIVO-Trad-ecosysteme/GIT/Vivo-languages



NB. You only need to do these edits once before the first time you start verifying Jira tickets.



6. Use vi or any text editor to add the following line to the [remote "origin"] section:


[remote "origin"]
...
fetch = +refs/pull/*/head:refs/remotes/origin/pull/*

Using vi:



Using notepad :



7. Save and exit

8. For each directory, after editing the .git/config file do a 'git fetch' to retrieve the latest objects:


Sacha@Sacha-XPS MINGW64 /c/VIVO-Trad-ecosysteme/GIT/Vitro (master)
$ git fetch
remote: Enumerating objects: 1548, done.
remote: Counting objects: 100% (1548/1548), done.
remote: Compressing objects: 100% (63/63), done.
remote: Total 3581 (delta 1484), reused 1529 (delta 1472), pack-reused 2033
Receiving objects: 100% (3581/3581), 873.43 KiB | 13.23 MiB/s, done.
Resolving deltas: 100% (1703/1703), completed with 671 local objects.
From https://github.com/vivo-project/Vitro
* [new ref] refs/pull/1/head -> origin/pull/1
* [new ref] refs/pull/10/head -> origin/pull/10
* [new ref] refs/pull/100/head -> origin/pull/100
* [new ref] refs/pull/101/head -> origin/pull/101
* [new ref] refs/pull/102/head -> origin/pull/102
* [new ref] refs/pull/103/head -> origin/pull/103





9. After editing all .git/config files and fetching all objects, go to the Jira ticket you want to verify and find the pull number in the comments , for example:
Pull-requests with new i18n property for "Edit Page Title":

https://github.com/vivo-project/Vitro-languages/pull/17
https://github.com/vivo-project/Vitro/pull/157




10. At the Git prompt checkout each pull number from the directory  :


Sacha@Sacha-XPS MINGW64 /c/VIVO-Trad-ecosysteme/GIT/Vitro (master)
$ git checkout --track origin/pull/157
Updating files: 100% (2321/2321), done.
Switched to branch 'pull/157'
Your branch is up to date with 'origin/pull/157'.

Sacha@Sacha-XPS MINGW64 /c/VIVO-Trad-ecosysteme/GIT/Vitro (pull/157)


11. Repeat this for all the pull numbers required to verify the Jira ticket.

12. You should now see the pull numbers in the Git view of TopBraid in Eclipse


13. If Tomcat is running, stop Tomcat by closing the terminal window.


14. If Solr is running stop Solr by using the dropdown option. Make sure you are in the Java perspective.


15. Select vivo-project-i18n CLEAN



16. Select vivo-project-i8n INSTALL



17. Start solr.


18. Start tomcat.


19. Verify that the fix works in the local instance of VIVO.

20. Return to the Jira ticket, indicate in a new comment that the fix is verified, if not provide details.

21. Click on the link to the pull number in GitHub

22. Go to the files tab in the GitHub pull request, and click on the green 'Review changes' button.


23. Leave a comment to approve the fix or follow up with a comment, and submit the review.
















  • Aucune étiquette