Updated pipeline files to support change of master to main (#64)

dsccommunity · Jan 21, 2021 · f0d2cdb · f0d2cdb
1 parent eae311c
commit f0d2cdb
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Pin `Pester` module to 4.10.1 because Pester 5.0 is missing code
   coverage - Fixes [Issue #60](https://github.com/dsccommunity/iSCSIDsc/issues/60).
 - Automatically publish documentation to GitHub Wiki - Fixes [Issue #61](https://github.com/dsccommunity/iSCSIDsc/issues/61).
+- Renamed `master` branch to `main` - Fixes [Issue #63](https://github.com/dsccommunity/iSCSIDsc/issues/63).
 
 ## [1.5.0.41] - 2017-09-02
 

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -8,6 +8,7 @@ assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}'
 branches:
   master:
     tag: preview
+    regex: ^main$
   pull-request:
     tag: PR
   feature:
@@ -20,7 +21,6 @@ branches:
     increment: Patch
     regex: (hot)?fix(es)?[\/-]
     source-branches: ['master']
-
 ignore:
   sha: []
 merge-message-formats: {}
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # iSCSIDsc
 
-[![Build Status](https://dev.azure.com/dsccommunity/iSCSIDsc/_apis/build/status/dsccommunity.iSCSIDsc?branchName=master)](https://dev.azure.com/dsccommunity/iSCSIDsc/_build/latest?definitionId=36&branchName=master)
-![Code Coverage](https://img.shields.io/azure-devops/coverage/dsccommunity/iSCSIDsc/36/master)
-[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/iSCSIDsc/36/master)](https://dsccommunity.visualstudio.com/iSCSIDsc/_test/analytics?definitionId=36&contextType=build)
+[![Build Status](https://dev.azure.com/dsccommunity/iSCSIDsc/_apis/build/status/dsccommunity.iSCSIDsc?branchName=main)](https://dev.azure.com/dsccommunity/iSCSIDsc/_build/latest?definitionId=36&branchName=main)
+![Code Coverage](https://img.shields.io/azure-devops/coverage/dsccommunity/iSCSIDsc/36/main)
+[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/iSCSIDsc/36/main)](https://dsccommunity.visualstudio.com/iSCSIDsc/_test/analytics?definitionId=36&contextType=build)
 [![PowerShell Gallery (with prereleases)](https://img.shields.io/powershellgallery/vpre/iSCSIDsc?label=iSCSIDsc%20Preview)](https://www.powershellgallery.com/packages/iSCSIDsc/)
 [![PowerShell Gallery](https://img.shields.io/powershellgallery/v/iSCSIDsc?label=iSCSIDsc)](https://www.powershellgallery.com/packages/iSCSIDsc/)
 
@@ -12,7 +12,7 @@ This project has adopted [this code of conduct](CODE_OF_CONDUCT.md).
 
 ## Releases
 
-For each merge to the branch `master` a preview release will be
+For each merge to the branch `main` a preview release will be
 deployed to [PowerShell Gallery](https://www.powershellgallery.com/).
 Periodically a release version tag will be pushed which will deploy a
 full release to [PowerShell Gallery](https://www.powershellgallery.com/).

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - source/*
@@ -288,7 +288,7 @@ stages:
       and(
         succeeded(),
         or(
-          eq(variables['Build.SourceBranch'], 'refs/heads/master'),
+          eq(variables['Build.SourceBranch'], 'refs/heads/main'),
           startsWith(variables['Build.SourceBranch'], 'refs/tags/')
         ),
         contains(variables['System.TeamFoundationCollectionUri'], 'dsccommunity')
@@ -317,6 +317,8 @@ stages:
             env:
               GitHubToken: $(GitHubToken)
               GalleryApiToken: $(GalleryApiToken)
+              ReleaseBranch: main
+              MainGitBranch: main
 
           - task: PowerShell@2
             name: sendChangelogPR
@@ -327,3 +329,5 @@ stages:
               pwsh: true
             env:
               GitHubToken: $(GitHubToken)
+              ReleaseBranch: main
+              MainGitBranch: main
diff --git a/build.yaml b/build.yaml
@@ -73,6 +73,7 @@ DscTest:
     - output
   ExcludeModuleFile:
     - Modules/DscResource.Common
+  MainGitBranch: main
 
 Resolve-Dependency:
   Gallery: 'PSGallery'

diff --git a/source/Examples/Resources/iSCSIInitiator/1-iSCSIInitiator_ConfigureTargetPortal_Config.ps1 b/source/Examples/Resources/iSCSIInitiator/1-iSCSIInitiator_ConfigureTargetPortal_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/iSCSIDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/iSCSIDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/iSCSIDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/...Examples/Resources/iSCSIServerTarget/1-iSCSIServerTarget_ConfigureServerTarget_Config.ps1 b/...Examples/Resources/iSCSIServerTarget/1-iSCSIServerTarget_ConfigureServerTarget_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/iSCSIDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/iSCSIDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/iSCSIDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/...e/Examples/Resources/iSCSIVirtualDisk/1-iSCSIServerTarget_ConfigureVirtualDisk_Config.ps1 b/...e/Examples/Resources/iSCSIVirtualDisk/1-iSCSIServerTarget_ConfigureVirtualDisk_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/iSCSIDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/iSCSIDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/iSCSIDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/WikiSource/Home.md b/source/WikiSource/Home.md
@@ -32,4 +32,4 @@ Get-DscResource -Module iSCSIDsc
 
 ## Change Log
 
-A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/iSCSIDsc/blob/master/CHANGELOG.md).
+A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/iSCSIDsc/blob/main/CHANGELOG.md).
diff --git a/source/iSCSIDsc.psd1 b/source/iSCSIDsc.psd1
@@ -52,7 +52,7 @@
             Tags       = @('DesiredStateConfiguration', 'DSC', 'DSCResource', 'iSCSI', 'Target', 'Initiator')
 
             # A URL to the license for this module.
-            LicenseUri = 'https://github.com/dsccommunity/iSCSIDsc/blob/dev/LICENSE'
+            LicenseUri = 'https://github.com/dsccommunity/iSCSIDsc/blob/main/LICENSE'
 
             # A URL to the main website for this project.
             ProjectUri = 'https://github.com/dsccommunity/iSCSIDsc'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ Get-DscResource -Module iSCSIDsc

		## Change Log

		A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/iSCSIDsc/blob/master/CHANGELOG.md).
		A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/iSCSIDsc/blob/main/CHANGELOG.md).