QA/Execution/Web Testing/Automation/github: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
No edit summary
No edit summary
 
(2 intermediate revisions by 2 users not shown)
Line 1: Line 1:
If you are working with a Fork of one of repositories, please follow the steps below as it makes processing GitHub Pull Requests easier.  
If you are working with a Fork of one of repositories, please follow the steps below as it makes processing GitHub Pull Requests easier.  


#git branch some-new-test  
#git branch some-new-test-branch
#git add test_that_breaks_the_world.py  
#git add test_that_breaks_the_world.py  
#git commit -m 'You need this amazing-ness'  
#git commit -m 'You need this amazing-ness'  
#git push origin some-new-test
#git push origin some-new-test-branch


Then do the Github pull request as you have already.  
Then do the Github pull request as you have already.  
Line 20: Line 20:
That deletes the remote copy in your Github.  
That deletes the remote copy in your Github.  


<br>  
<br>


If your project has files that have sensitive information, like user-names &amp; passwords then this is how you avoid committing those files to GitHub repository:
==Tagging of Projects==


&nbsp;&nbsp;&nbsp; 1. In your tests folder path:<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; git add *.py<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; This will add all .py files to staging are (including the sensitive file)<br>
Whenever a new version of the site you are working on is released please tag at the same time as the main site. This means that if we need to roll back to a specific version its easy to checkout to that point.


&nbsp;&nbsp;&nbsp; 2. git rm --cached sensitive_file_name<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; This command will prevent the file from being committed but leave the file on your local disk<br>
To tag do the following


Alternatively, just add the files that have changed so that you don't do a blanket commit and commit things that should be in a separate commit. <br>
# git tag VersionOfProject
# git push --tags

Latest revision as of 14:05, 11 July 2011

If you are working with a Fork of one of repositories, please follow the steps below as it makes processing GitHub Pull Requests easier.

  1. git branch some-new-test-branch
  2. git add test_that_breaks_the_world.py
  3. git commit -m 'You need this amazing-ness'
  4. git push origin some-new-test-branch

Then do the Github pull request as you have already.

Then once the pull request has been completed do

  • git merge some-new-test

This merges in your changes to your local master

When done and you want to delete the remote branch do

  • git push origin :some-new-test

That deletes the remote copy in your Github.


Tagging of Projects

Whenever a new version of the site you are working on is released please tag at the same time as the main site. This means that if we need to roll back to a specific version its easy to checkout to that point.

To tag do the following

  1. git tag VersionOfProject
  2. git push --tags
Retrieved from "https://wiki.allizom.org/index.php?title=QA/Execution/Web_Testing/Automation/github&oldid=327514"