Skip to content

Commit 6e3320e

Browse files
johljujohlju
committed
Updated pipeline files to support change of master to main
1 parent 69d877f commit 6e3320e

26 files changed

+41
-31
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
If you'd like to contribute to this project, please review the [Contribution Guidelines](https://github.com/PowerShell/DscResources/blob/master/CONTRIBUTING.md).
1+
# Contributing
2+
3+
If you'd like to contribute to this project, please check out common DSC Community
4+
[contributing guidelines](https://dsccommunity.org/guidelines/contributing).

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
2525
### Changed
2626

2727
- xFailOverCluster
28+
- Renamed `master` branch to `main` ([issue #246](https://github.com/dsccommunity/xFailOverCluster/issues/246)).
2829
- Updated the CI pipeline files to the latest template.
2930
- Changed unit tests to handle missing DscResource.Test better.
3031
- Changed the Code of Conduct to the one adopted by DSC Community.

‎GitVersion.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}'
88
branches:
99
master:
1010
tag: preview
11+
regex: ^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+
source-branches: ['main']
2324

2425
ignore:
2526
sha: []

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# xFailOverCluster
22

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

@@ -16,7 +16,7 @@ This project has adopted this [Code of Conduct](CODE_OF_CONDUCT.md).
1616

1717
## Releases
1818

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

‎azure-pipelines.yml‎

Lines changed: 6 additions & 2 deletions
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/*
@@ -191,7 +191,7 @@ stages:
191191
and(
192192
succeeded(),
193193
or(
194-
eq(variables['Build.SourceBranch'], 'refs/heads/master'),
194+
eq(variables['Build.SourceBranch'], 'refs/heads/main'),
195195
startsWith(variables['Build.SourceBranch'], 'refs/tags/')
196196
),
197197
contains(variables['System.TeamFoundationCollectionUri'], 'dsccommunity')
@@ -219,6 +219,8 @@ stages:
219219
env:
220220
GitHubToken: $(GitHubToken)
221221
GalleryApiToken: $(GalleryApiToken)
222+
ReleaseBranch: main
223+
MainGitBranch: main
222224
- task: PowerShell@2
223225
name: sendChangelogPR
224226
displayName: 'Send Changelog PR'
@@ -228,3 +230,5 @@ stages:
228230
pwsh: true
229231
env:
230232
GitHubToken: $(GitHubToken)
233+
ReleaseBranch: main
234+
MainGitBranch: main

‎build.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ DscTest:
7272
- output
7373
ExcludeModuleFile:
7474
- Modules/DscResource.Common
75+
MainGitBranch: main
7576

7677
Resolve-Dependency:
7778
Gallery: 'PSGallery'

‎codecov.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
codecov:
22
notify:
33
require_ci_to_pass: no
4-
# master should be the baseline for reporting
5-
branch: master
4+
# main should be the baseline for reporting
5+
branch: main
66

77
comment:
88
layout: "reach, diff"

‎source/Examples/Resources/xCluster/1-xCluster_CreateFirstNodeOfAFailoverClusterConfig.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
.TAGS DSCConfiguration
1414
15-
.LICENSEURI https://github.com/dsccommunity/xFailOverCluster/blob/master/LICENSE
15+
.LICENSEURI https://github.com/dsccommunity/xFailOverCluster/blob/main/LICENSE
1616
1717
.PROJECTURI https://github.com/dsccommunity/xFailOverCluster
1818

‎source/Examples/Resources/xCluster/2-xCluster_JoinAdditionalNodeToFailoverClusterConfig.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
.TAGS DSCConfiguration
1414
15-
.LICENSEURI https://github.com/dsccommunity/xFailOverCluster/blob/master/LICENSE
15+
.LICENSEURI https://github.com/dsccommunity/xFailOverCluster/blob/main/LICENSE
1616
1717
.PROJECTURI https://github.com/dsccommunity/xFailOverCluster
1818

‎source/Examples/Resources/xCluster/3-xCluster_CreateFailoverClusterWithTwoNodesConfig.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
.TAGS DSCConfiguration
1414
15-
.LICENSEURI https://github.com/dsccommunity/xFailOverCluster/blob/master/LICENSE
15+
.LICENSEURI https://github.com/dsccommunity/xFailOverCluster/blob/main/LICENSE
1616
1717
.PROJECTURI https://github.com/dsccommunity/xFailOverCluster
1818

0 commit comments

Comments
 (0)