Skip to content

Commit 11561f1

Browse files
committed
Updated pipeline files to support rename of master branch
1 parent a3ed797 commit 11561f1

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

GitVersion.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}'
88
branches:
99
master:
1010
tag: preview
11+
regex: ^master$|^main$
1112
pull-request:
1213
tag: PR
1314
feature:
1415
tag: useBranchName
1516
increment: Minor
1617
regex: f(eature(s)?)?[\/-]
17-
source-branches: ['master']
18+
source-branches: ['main']
1819
hotfix:
1920
tag: fix
2021
increment: Patch
2122
regex: (hot)?fix(es)?[\/-]
22-
source-branches: ['master']
23-
23+
source-branches: ['main']
2424
ignore:
2525
sha: []
2626
merge-message-formats: {}

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# FileContentDsc
22

3-
[![Build Status](https://dev.azure.com/dsccommunity/FileContentDsc/_apis/build/status/dsccommunity.FileContentDsc?branchName=master)](https://dev.azure.com/dsccommunity/FileContentDsc/_build/latest?definitionId=31&branchName=master)
4-
![Code Coverage](https://img.shields.io/azure-devops/coverage/dsccommunity/FileContentDsc/31/master)
5-
[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/FileContentDsc/31/master)](https://dsccommunity.visualstudio.com/FileContentDsc/_test/analytics?definitionId=31&contextType=build)
3+
[![Build Status](https://dev.azure.com/dsccommunity/FileContentDsc/_apis/build/status/dsccommunity.FileContentDsc?branchName=main)](https://dev.azure.com/dsccommunity/FileContentDsc/_build/latest?definitionId=31&branchName=main)
4+
![Code Coverage](https://img.shields.io/azure-devops/coverage/dsccommunity/FileContentDsc/31/main)
5+
[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/FileContentDsc/31/main)](https://dsccommunity.visualstudio.com/FileContentDsc/_test/analytics?definitionId=31&contextType=build)
66
[![PowerShell Gallery (with prereleases)](https://img.shields.io/powershellgallery/vpre/FileContentDsc?label=FileContentDsc%20Preview)](https://www.powershellgallery.com/packages/FileContentDsc/)
77
[![PowerShell Gallery](https://img.shields.io/powershellgallery/v/FileContentDsc?label=FileContentDsc)](https://www.powershellgallery.com/packages/FileContentDsc/)
88

@@ -12,7 +12,7 @@ This project has adopted [this code of conduct](CODE_OF_CONDUCT.md).
1212

1313
## Releases
1414

15-
For each merge to the branch `master` a preview release will be
15+
For each merge to the branch `main` a preview release will be
1616
deployed to [PowerShell Gallery](https://www.powershellgallery.com/).
1717
Periodically a release version tag will be pushed which will deploy a
1818
full release to [PowerShell Gallery](https://www.powershellgallery.com/).

azure-pipelines.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
trigger:
22
branches:
33
include:
4-
- master
4+
- main
55
paths:
66
include:
77
- source/*
@@ -277,6 +277,8 @@ stages:
277277
env:
278278
GitHubToken: $(GitHubToken)
279279
GalleryApiToken: $(GalleryApiToken)
280+
ReleaseBranch: main
281+
MainGitBranch: main
280282

281283
- task: PowerShell@2
282284
name: sendChangelogPR
@@ -287,3 +289,5 @@ stages:
287289
pwsh: true
288290
env:
289291
GitHubToken: $(GitHubToken)
292+
ReleaseBranch: main
293+
MainGitBranch: main

build.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ DscTest:
7474
- output
7575
ExcludeModuleFile:
7676
- Modules/DscResource.Common
77+
MainGitBranch: main
7778

7879
Resolve-Dependency:
7980
Gallery: 'PSGallery'

source/FileContentDsc.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
Tags = @('DesiredStateConfiguration', 'DSC', 'DSCResource', 'FileContent')
5353

5454
# A URL to the license for this module.
55-
LicenseUri = 'https://github.com/dsccommunity/FileContentDsc/blob/master/LICENSE'
55+
LicenseUri = 'https://github.com/dsccommunity/FileContentDsc/blob/main/LICENSE'
5656

5757
# A URL to the main website for this project.
5858
ProjectUri = 'https://github.com/dsccommunity/FileContentDsc'

source/WikiSource/Home.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ Get-DscResource -Module FileContentDsc
3333

3434
## Change Log
3535

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

0 commit comments

Comments
 (0)