Branches

From OpenSimulator

(Difference between revisions)
Jump to: navigation, search
(OpenSimulator Policy)
m (added direct links to the git repos, branches, and tags to make them easier to find)
Line 2: Line 2:
 
{{Quicklinks}}
 
{{Quicklinks}}
  
This page outlines the various OpenSimulator repository branches, what they are for, and our policy for what goes into it.
+
== Branches and Tags in the Git Repo ==
 +
 
 +
OpenSimulator uses Git for its source code repository. The repository contains various branches and tags used to identify development branches and release branches of the code. The primary git repository is hosted on the opensimulator.org domain. A mirror is maintained on Github. The Github repo is sync'ed with the primary every 10 minutes.
 +
 
 +
=== Git Repos ===
 +
 
 +
* [http://opensimulator.org/viewgit/ '''Primary''' OpenSimulator Git Repo]
 +
* [https://github.com/opensim/ '''Mirror''' OpenSimulator Github Repo]
 +
 
 +
=== Repositories in the Primary Git ===
 +
 
 +
* [http://opensimulator.org/viewgit/?a=summary&p=opensim opensim] - the OpenSimulator source code
 +
* [http://opensimulator.org/viewgit/?a=tree&p=opensim-libs opensim-libs] - forks of third party libraries used in building OpenSimulator
 +
 
 +
This page outlines the repository branches and tags; what they are for, and our policy for what goes into it.
  
 
Also read
 
Also read
 
* [[Submitting code to OpenSim|Submitting Code to OpenSim]]
 
* [[Submitting code to OpenSim|Submitting Code to OpenSim]]
  
== master ==
+
== Branches ==
  
master holds bleeding edge OpenSimulator development.
+
=== master ===
  
=== OpenSimulator Policy ===
+
The master branch holds bleeding edge OpenSimulator development.
  
* Master is not guaranteed to function. It might be in the middle of a transition, or undergoing major overhaul.
+
'''OpenSimulator Master Branch Policies'''
 +
 
 +
* Master is not guaranteed to function. It might be in the middle of a transition, or undergoing a major overhaul.
 
* Master should always build
 
* Master should always build
 
* All tests should run green on trunk
 
* All tests should run green on trunk
 
* Code should have been reasonably tested
 
* Code should have been reasonably tested
  
== <version>-release ==
+
'''Browse the master branch'''
 +
 
 +
* [http://opensimulator.org/viewgit/?a=tree&p=opensim&h=refs/heads/master OpenSimulator master branch]
 +
 
 +
=== <version>-release ===
  
 
These branches contain release code. For instance, 0.7.0.2-release
 
These branches contain release code. For instance, 0.7.0.2-release
  
== <version>-post-fixes ==
+
=== <version>-post-fixes ===
  
 
These branches contain release code that has had fixes applied afterwards. For instance, 0.7.0.1-post-fixes. If no post fix branch exists then no post fixes have been done.
 
These branches contain release code that has had fixes applied afterwards. For instance, 0.7.0.1-post-fixes. If no post fix branch exists then no post fixes have been done.
  
== other branches ==
+
=== Other Branches ===
  
 
Other branches mainly contain individual developer's work.
 
Other branches mainly contain individual developer's work.
 +
 +
'''Browse a list of all branches'''
 +
 +
* [http://opensimulator.org/viewgit/?a=summary&p=opensim List of Branches (see bottom of page)]
 +
 +
== Tags ==
 +
 +
Tags were originally used to trigger the automatic release build process. When it was time for a release, a <version>-release tag was applied to a branch, triggering the automated process that produced the release tarballs. For more details see [[Automated Release Building]]. Tags continue to be used to mark releases but may also be used for other purposes.
 +
 +
'''Browse a list of all tags'''
 +
 +
* [http://opensimulator.org/viewgit/?a=tags&p=opensim List of all tags]

Revision as of 07:55, 30 September 2020

Branches and Tags in the Git Repo

OpenSimulator uses Git for its source code repository. The repository contains various branches and tags used to identify development branches and release branches of the code. The primary git repository is hosted on the opensimulator.org domain. A mirror is maintained on Github. The Github repo is sync'ed with the primary every 10 minutes.

Git Repos

Repositories in the Primary Git

  • opensim - the OpenSimulator source code
  • opensim-libs - forks of third party libraries used in building OpenSimulator

This page outlines the repository branches and tags; what they are for, and our policy for what goes into it.

Also read

Branches

master

The master branch holds bleeding edge OpenSimulator development.

OpenSimulator Master Branch Policies

  • Master is not guaranteed to function. It might be in the middle of a transition, or undergoing a major overhaul.
  • Master should always build
  • All tests should run green on trunk
  • Code should have been reasonably tested

Browse the master branch

<version>-release

These branches contain release code. For instance, 0.7.0.2-release

<version>-post-fixes

These branches contain release code that has had fixes applied afterwards. For instance, 0.7.0.1-post-fixes. If no post fix branch exists then no post fixes have been done.

Other Branches

Other branches mainly contain individual developer's work.

Browse a list of all branches

Tags

Tags were originally used to trigger the automatic release build process. When it was time for a release, a <version>-release tag was applied to a branch, triggering the automated process that produced the release tarballs. For more details see Automated Release Building. Tags continue to be used to mark releases but may also be used for other purposes.

Browse a list of all tags

Personal tools
General
About This Wiki