From 2a5580e24b5de6337f2ff23b152220629e62acab Mon Sep 17 00:00:00 2001 From: Johan Ljunggren Date: Mon, 21 May 2018 09:11:57 +0200 Subject: [PATCH] Changes to xActiveDirectory - Adding a Branches section to the README.md with Codecov badges for both master and dev branch (issue #192). --- README.md | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cbd878225..029054533 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,32 @@ # xActiveDirectory -[![Build status](https://ci.appveyor.com/api/projects/status/p4jejr60jrgb8ity/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xactivedirectory/branch/master) -[![codecov](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/xActiveDirectory) - -The **xActiveDirectory** DSC resources allow you to configure and manage Active Directory. -Note: these resources do not presently install the RSAT tools. +The **xActiveDirectory** DSC resources allow you to configure and manage Active +Directory. +Note: these resources do not presently install the Remote Server Administration +Tools (RSAT). This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. +## Branches + +### master + +[![Build status](https://ci.appveyor.com/api/projects/status/p4jejr60jrgb8ity/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xActiveDirectory/branch/master) +[![codecov](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/master) + +This is the branch containing the latest release - +no contributions should be made directly to this branch. + +### dev + +[![Build status](https://ci.appveyor.com/api/projects/status/p4jejr60jrgb8ity/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/xActiveDirectory/branch/dev) +[![codecov](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/dev) + +This is the development branch +to which contributions should be proposed by contributors as pull requests. +This development branch will periodically be merged to the master branch, +and be released to [PowerShell Gallery](https://www.powershellgallery.com/). ## Contributing Please check out common DSC Resource [contributing guidelines](https://github.com/PowerShell/DscResources/blob/master/CONTRIBUTING.md). @@ -291,6 +309,8 @@ The xADServicePrincipalName DSC resource will manage service principal names. * Changes to xActiveDirectory * The resources are now in alphabetical order in the README.md ([issue #194](https://github.com/PowerShell/xActiveDirectory/issues/194)). + * Adding a Branches section to the README.md with Codecov badges for both + master and dev branch ([issue #192](https://github.com/PowerShell/xActiveDirectory/issues/192)). ### 2.18.0.0