Skip to content

Commit 4d69891

Browse files
Sync eng/common directory with azure-sdk-tools for PR 1716 (#19366)
* Update links with master to use main * Update ci.yml files Co-authored-by: Chidozie Ononiwu <[email protected]>
1 parent 0ff2bb6 commit 4d69891

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

eng/common/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Common Engineering System
22

3-
Updates under this directory should only be made in the `azure-sdk-tools` repo as any changes under this directory outside of that repo will end up getting overwritten with future updates. For information about making updates see [common engineering system docs](https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md)
3+
Updates under this directory should only be made in the `azure-sdk-tools` repo as any changes under this directory outside of that repo will end up getting overwritten with future updates. For information about making updates see [common engineering system docs](https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md)

eng/common/docgeneration/Generate-DocIndex.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,5 +177,5 @@ else
177177
{
178178
LogWarning "The function for 'GetGithubIoDocIndexFn' was not found.`
179179
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
180-
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
180+
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
181181
}

eng/common/pipelines/templates/steps/check-spelling.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# and some ref (branch, tag, etc.) or commit hash. Only runs on PRs.
33
# ContinueOnError - true: Pipeline warns on spelling error
44
# false: Pipeline fails on spelling error
5-
# TargetBranch - Target ref (e.g. master) to compare to create file change
5+
# TargetBranch - Target ref (e.g. main) to compare to create file change
66
# list.
77
# CspellConfigPath - Path to cspell.json config location
88

eng/common/pipelines/templates/steps/docs-metadata-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ parameters:
2626
default: ''
2727
- name: PRBranchName
2828
type: string
29-
default: 'master-rdme'
29+
default: 'main-rdme'
3030
- name: PRLabels
3131
type: string
3232
default: 'auto-merge'

eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ steps:
1616
if (($LASTEXITCODE -eq 0) -and ($filesInCommonDir.Count -gt 0))
1717
{
1818
Write-Host "##vso[task.LogIssue type=error;]Changes to files under 'eng/common' directory should not be made in this Repo`n${filesInCommonDir}"
19-
Write-Host "##vso[task.LogIssue type=error;]Please follow workflow at https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md"
19+
Write-Host "##vso[task.LogIssue type=error;]Please follow workflow at https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md"
2020
exit 1
2121
}
2222
}

eng/common/scripts/Create-APIReview.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ else
7171
{
7272
Write-Host "The function for 'FindArtifactForApiReviewFn' was not found.`
7373
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
74-
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
74+
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
7575
exit(1)
7676
}
7777

@@ -104,7 +104,7 @@ if ($packages)
104104
Write-Host "Version: $($version)"
105105
Write-Host "SDK Type: $($pkgInfo.SdkType)"
106106

107-
# Run create review step only if build is triggered from master branch or if version is GA.
107+
# Run create review step only if build is triggered from main branch or if version is GA.
108108
# This is to avoid invalidating review status by a build triggered from feature branch
109109
if ( ($SourceBranch -eq $DefaultBranch) -or (-not $version.IsPrerelease))
110110
{

eng/common/scripts/Package-Properties.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function Get-AllPkgProperties ([string]$ServiceDirectory = $null)
126126
return $pkgPropsResult
127127
}
128128

129-
# Given the metadata url under https://github.com/Azure/azure-sdk/tree/master/_data/releases/latest,
129+
# Given the metadata url under https://github.com/Azure/azure-sdk/tree/main/_data/releases/latest,
130130
# the function will return the csv metadata back as part of response.
131131
function Get-CSVMetadata ([string]$MetadataUri=$MetadataUri)
132132
{
@@ -143,7 +143,7 @@ function Get-PkgPropsForEntireService ($serviceDirectoryPath)
143143
{
144144
LogError "The function for '$GetPackageInfoFromRepoFn' was not found.`
145145
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
146-
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
146+
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
147147
}
148148

149149
foreach ($directory in (Get-ChildItem $serviceDirectoryPath -Directory))

eng/common/scripts/Prepare-Release.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ else
180180
{
181181
LogError "The function 'SetPackageVersion' was not found.`
182182
Make sure it is present in eng/scripts/Language-Settings.ps1.`
183-
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
183+
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
184184
exit 1
185185
}
186186

eng/common/scripts/Update-DocsMsPackages.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ if ($UpdateDocsMsPackagesFn -and (Test-Path "Function:$UpdateDocsMsPackagesFn"))
3131
} else {
3232
LogError "The function for '$UpdateFn' was not found.`
3333
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
34-
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
34+
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
3535
exit 1
3636
}

eng/common/scripts/artifact-metadata-parsing.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function RetrievePackages($artifactLocation) {
101101
{
102102
LogError "The function for '$GetPackageInfoFromPackageFileFn' was not found.`
103103
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
104-
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
104+
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
105105
}
106106
}
107107

0 commit comments

Comments
 (0)