Skip to content

Commit

Permalink
Update links with master to use main (#1716)
Browse files Browse the repository at this point in the history
Updating master references to main.
The changes here are not much so am doing it as a PR.
  • Loading branch information
chidozieononiwu authored Jun 21, 2021
1 parent 08ad132 commit 2a8c2c9
Show file tree
Hide file tree
Showing 35 changed files with 35 additions and 53 deletions.
4 changes: 2 additions & 2 deletions .azure-pipelines/apiview.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
- hotfix/*
Expand All @@ -14,7 +14,7 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
- hotfix/*
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
- hotfix/*
Expand All @@ -16,7 +16,7 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
- hotfix/*
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/warden.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
- hotfix/*
Expand All @@ -12,7 +12,7 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
- hotfix/*
Expand Down
2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ This folder contains some documentations for this repository.

The folder structure is the following.

- [common:](https://github.com/Azure/azure-sdk-tools/tree/master/doc/common) contains documentation for engineering system common tools.
- [common:](https://github.com/Azure/azure-sdk-tools/tree/main/doc/common) contains documentation for engineering system common tools.
2 changes: 1 addition & 1 deletion eng/common/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Common Engineering System

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)
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)
2 changes: 1 addition & 1 deletion eng/common/docgeneration/Generate-DocIndex.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,5 @@ else
{
LogWarning "The function for 'GetGithubIoDocIndexFn' was not found.`
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
}
2 changes: 1 addition & 1 deletion eng/common/pipelines/templates/steps/check-spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# and some ref (branch, tag, etc.) or commit hash. Only runs on PRs.
# ContinueOnError - true: Pipeline warns on spelling error
# false: Pipeline fails on spelling error
# TargetBranch - Target ref (e.g. master) to compare to create file change
# TargetBranch - Target ref (e.g. main) to compare to create file change
# list.
# CspellConfigPath - Path to cspell.json config location

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ parameters:
default: ''
- name: PRBranchName
type: string
default: 'master-rdme'
default: 'main-rdme'
- name: PRLabels
type: string
default: 'auto-merge'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
if (($LASTEXITCODE -eq 0) -and ($filesInCommonDir.Count -gt 0))
{
Write-Host "##vso[task.LogIssue type=error;]Changes to files under 'eng/common' directory should not be made in this Repo`n${filesInCommonDir}"
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"
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"
exit 1
}
}
Expand Down
4 changes: 2 additions & 2 deletions eng/common/scripts/Create-APIReview.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ else
{
Write-Host "The function for 'FindArtifactForApiReviewFn' was not found.`
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
exit(1)
}

Expand Down Expand Up @@ -104,7 +104,7 @@ if ($packages)
Write-Host "Version: $($version)"
Write-Host "SDK Type: $($pkgInfo.SdkType)"

# Run create review step only if build is triggered from master branch or if version is GA.
# Run create review step only if build is triggered from main branch or if version is GA.
# This is to avoid invalidating review status by a build triggered from feature branch
if ( ($SourceBranch -eq $DefaultBranch) -or (-not $version.IsPrerelease))
{
Expand Down
4 changes: 2 additions & 2 deletions eng/common/scripts/Package-Properties.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function Get-AllPkgProperties ([string]$ServiceDirectory = $null)
return $pkgPropsResult
}

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

foreach ($directory in (Get-ChildItem $serviceDirectoryPath -Directory))
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Prepare-Release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ else
{
LogError "The function 'SetPackageVersion' was not found.`
Make sure it is present in eng/scripts/Language-Settings.ps1.`
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
exit 1
}

Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Update-DocsMsPackages.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ if ($UpdateDocsMsPackagesFn -and (Test-Path "Function:$UpdateDocsMsPackagesFn"))
} else {
LogError "The function for '$UpdateFn' was not found.`
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
exit 1
}
2 changes: 1 addition & 1 deletion eng/common/scripts/artifact-metadata-parsing.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function RetrievePackages($artifactLocation) {
{
LogError "The function for '$GetPackageInfoFromPackageFileFn' was not found.`
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
}
}

Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/copy-docs-to-blobstorage.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,6 @@ else
{
LogWarning "The function for '$PublishGithubIODocsFn' was not found.`
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
}

3 changes: 1 addition & 2 deletions eng/pipelines/eng-common-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ trigger: none
pr:
branches:
include:
- master
- main
paths:
include:
Expand Down Expand Up @@ -133,7 +132,7 @@ stages:
-UserReviewers $(System.PullRequest.Creator)
-Assignees $(System.PullRequest.Creator)
-PRBody "Sync ${{ parameters.DirectoryToSync }} directory with azure-sdk-tools for PR https://github.com/Azure/azure-sdk-tools/pull/$(System.PullRequest.PullRequestNumber) `
See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/master/eng/common/README.md#workflow)"
See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/main/eng/common/README.md#workflow)"
- pwsh: |
$PRData = "Azure;${{ repo }};$(Submitted.PullRequest.Number)"
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/githubio-linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
pwsh: true
filePath: eng/common/scripts/Verify-Links.ps1
arguments: >
-urls "https://raw.githubusercontent.com/Azure/azure-sdk-for-go/master/CHANGELOG.md"
-urls "https://raw.githubusercontent.com/Azure/azure-sdk-for-go/main/CHANGELOG.md"
-ignoreLinksFile "./eng/pipelines/githubio-linkcheck-ignore-links.txt"
-inputCacheFile "$(cachefile)"
-outputCacheFile "$(cachefile)"
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/pipeline-generation-single.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Variables defined in pipeline definition
# DevOpsProject - public, internal
# Branch - master
# Branch - main
# Prefix - net, python, js, java, <lang>-pr
# RepositoryName - azure-sdk-for-<lang>
# DevOpsPath - $(Prefix)\pr
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/setup-tutorial-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ trigger: none
# This pipeline is used to trigger a script which creates a branch in the repository specified
# by the Repository parameter below. It creates a branch with the name feature/tutorial/<alias>
# and will be used in training to help training participants get a branch setup to merge their
# code into to simulate real world CI/CD usage without poluting the master branch.
# code into to simulate real world CI/CD usage without poluting the main branch.
#
# The Alias parameter forms part of the branch name above, and the GitReference parameter which
# has a default of refs/heads/feature/tutorial can be overriden if a different base branch is
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/steps/sync-directory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ steps:
-IssueNumber "$(System.PullRequest.PullRequestNumber)"
-Comment "The following pipelines have been queued for testing:<br>$env:QueuedPipelines`
<br>You can sign off on the approval gate to test the release stage of each pipeline.`
<br>See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/master/eng/common/README.md#workflow)"
<br>See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/main/eng/common/README.md#workflow)"
-AuthToken "$(azuresdk-github-pat)"
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/steps/sync-repo-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ parameters:
# Provde a list of repos
# Example:
# Azure/azure-rest-api-specs:
# Branch: master
# Branch: main
# TargetRepos:
# Azure/azure-rest-api-specs-pr:
# azure-sdk/azure-rest-api-specs:
# Branch: dev
# Rebase: true
# Azure/azure-sdk-for-go:
# Branch: master
# Branch: main
# TargetRepos:
# Azure/azure-sdk-for-go-pr:
- name: Repos
Expand Down
4 changes: 2 additions & 2 deletions packages/python-packages/doc-warden/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Doc Warden [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/108?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=108&branchName=master)
# Doc Warden [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/108?branchName=main)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=108&branchName=main)

Every CI build owned by the Azure-SDK team also needs to verify that the documentation within the target repo meets a set of standards. `Doc-warden` is intended to ease the _implementation_ of these checks in CI builds.

Expand Down Expand Up @@ -228,7 +228,7 @@ For .net, `warden` will traverse **up** one directory at a time, looking for the

Note that `warden` will not even execute an index against a .NET repo _unless the traversal stops are set_.

[SDK for net .docsettings](https://github.com/Azure/azure-sdk-for-net/blob/master/eng/.docsettings.yml) is a great example for both the exclusion list as well as the traversal stops.
[SDK for net .docsettings](https://github.com/Azure/azure-sdk-for-net/blob/main/eng/.docsettings.yml) is a great example for both the exclusion list as well as the traversal stops.

## Provide Feedback

Expand Down
1 change: 0 additions & 1 deletion src/dotnet/Mgmt.CI.BuildTools/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.

trigger:
- master
- main

resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class APIListing {
private String packageVersion;

// This string is taken from here:
// https://github.com/Azure/azure-sdk-tools/blob/master/src/dotnet/APIView/APIView/Languages/CodeFileBuilder.cs#L50
// https://github.com/Azure/azure-sdk-tools/blob/main/src/dotnet/APIView/APIView/Languages/CodeFileBuilder.cs#L50
@JsonProperty("VersionString")
private final String versionString = "19";

Expand Down
2 changes: 0 additions & 2 deletions tools/CreateRuleFabricBot/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
Expand All @@ -14,7 +13,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
Expand Down
2 changes: 0 additions & 2 deletions tools/check-enforcer/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
Expand All @@ -14,7 +13,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
Expand Down
2 changes: 0 additions & 2 deletions tools/github-issues/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
Expand All @@ -14,7 +13,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
Expand Down
4 changes: 2 additions & 2 deletions tools/http-fault-injector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,5 @@ At the last step in your http client pipeline:
2. Change the host and port in the URI to the HttpFaultInjector

## Runnable Sample Clients
* .NET: https://github.com/Azure/azure-sdk-tools/tree/master/tools/http-fault-injector/sample-clients/net
* Java: https://github.com/Azure/azure-sdk-tools/tree/master/tools/http-fault-injector/sample-clients/java
* .NET: https://github.com/Azure/azure-sdk-tools/tree/main/tools/http-fault-injector/sample-clients/net
* Java: https://github.com/Azure/azure-sdk-tools/tree/main/tools/http-fault-injector/sample-clients/java
2 changes: 0 additions & 2 deletions tools/http-fault-injector/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
Expand All @@ -14,7 +13,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
Expand Down
2 changes: 0 additions & 2 deletions tools/notification-configuration/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
Expand All @@ -14,7 +13,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace NotificationConfiguration
/// Performs rudimentary parsing of a CODEOWNERS file for synchornizing into
/// </summary>
/// <remarks>
/// See: https://github.com/Azure/azure-sdk/blob/master/docs/engineering-system/codeowners.md
/// See: https://github.com/Azure/azure-sdk/blob/main/docs/engineering-system/codeowners.md
/// </remarks>
public class CodeOwnersParser
{
Expand Down
2 changes: 0 additions & 2 deletions tools/pipeline-generator/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
Expand All @@ -14,7 +13,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
Expand Down
2 changes: 0 additions & 2 deletions tools/pipeline-witness/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
trigger:
branches:
include:
- master
- main
- feature/*
- release/*
Expand All @@ -14,7 +13,6 @@ trigger:
pr:
branches:
include:
- master
- main
- feature/*
- release/*
Expand Down
Loading

0 comments on commit 2a8c2c9

Please sign in to comment.