Update for "master" -> "main" branch rename (#2455)

* vcpkg.json -- update all links to point to "main" .. This is hardcoded and will go out in future releases.
* ci.yml -- add `- main` to trigger criteria near `- master` ... This adds forward compatilbitiy when we rename the branch in the repo
* archetype-cpp-release.yml use a script which evaluates a repo's default branch and sets that in a global variable, then use that variable instead. When vcpkg updates their branch the publishing scripts will work transparently.
* Collect-Changelogs.ps1 -- Add default hardcoded branch name for use with future releases. This can be optionally overridden with a parameter when invoking the script.
* eng/pipelines/client.yml -- Delete this file. It is no longer in use.
This commit is contained in:
Daniel Jurek 2021-06-18 09:09:27 -07:00 committed by GitHub
parent 01ba0b0c9c
commit fda88bf7b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 19 additions and 35 deletions

View File

@ -1,23 +0,0 @@
# DO NOT EDIT THIS FILE
# This file is generated automatically and any changes will be lost.
trigger:
branches:
include:
- master
- feature/*
- release/*
- hotfix/*
pr:
branches:
include:
- master
- feature/*
- release/*
- hotfix/*
jobs:
- template: ./templates/jobs/archetype-sdk-client.yml
parameters:
BuildReleaseArtifacts: false

View File

@ -143,6 +143,10 @@ stages:
- pwsh: Write-Host "##vso[task.setvariable variable=HasChanges]$true"
displayName: Set $(HasChanges) to $true for create-pull-request.yml
- template: /eng/common/pipelines/templates/steps/set-default-branch.yml
parameters:
WorkingDirectory: $(Pipeline.Workspace)/vcpkg
# SkipCheckingForChanges is true to skip the commit step
# (which is already done by Update-VcpkgPort.ps1)
- template: /eng/common/pipelines/templates/steps/create-pull-request.yml
@ -154,7 +158,7 @@ stages:
PRTitle: $(PrTitle)
PRBody: Update vcpkg ports for Azure SDK release. This release may contain multiple ports.
SkipCheckingForChanges: true
BaseBranchName: master
BaseBranchName: $(DefaultBranch)
OpenAsDraft: ${{ parameters.TestPipeline }}
CloseAfterOpenForTesting: '${{ parameters.TestPipeline }}'

View File

@ -18,7 +18,10 @@
param(
[Parameter(Mandatory=$true)]
[ValidateRange(1, 12)]
[int] $Month
[int] $Month,
[Parameter]
[string] $DefaultBranchName = 'main'
)
$repoRoot = Resolve-Path "$PSScriptRoot/../..";
@ -47,7 +50,7 @@ Get-ChildItem "$repoRoot/sdk" -Filter CHANGELOG.md -Recurse | Sort-Object -Prope
$version = $changeLogEntry.ReleaseVersion
$githubAnchor = $changeLogEntry.ReleaseTitle.Replace("## ", "").Replace(".", "").Replace("(", "").Replace(")", "").Replace(" ", "-")
$ReleaseNotes += "### $package [Changelog](https://github.com/Azure/azure-sdk-for-cpp/blob/master/sdk/$serviceDirectory/$package/CHANGELOG.md#$githubAnchor)`n"
$ReleaseNotes += "### $package [Changelog](https://github.com/Azure/azure-sdk-for-cpp/blob/${DefaultBranchName}/sdk/$serviceDirectory/$package/CHANGELOG.md#$githubAnchor)`n"
$changeLogEntry.ReleaseContent | %{
$ReleaseNotes += $_.Replace("###", "####")

View File

@ -8,7 +8,7 @@
"Microsoft Azure Core SDK for C++",
"This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/core/azure-core",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core",
"license": "MIT",
"dependencies": [
{

View File

@ -8,7 +8,7 @@
"Microsoft Azure Identity SDK for C++",
"This library provides common authentication-related abstractions for Azure SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/identity/azure-identity",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/identity/azure-identity",
"license": "MIT",
"dependencies": [
{

View File

@ -8,7 +8,7 @@
"Microsoft Azure Common Key Vault SDK for C++",
"This library provides common Azure Key Vault related abstractions for Azure SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-common",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-common",
"license": "MIT",
"dependencies": [
{

View File

@ -8,7 +8,7 @@
"Microsoft Azure Key Vault Keys SDK for C++",
"This library provides Azure Key Vault Keys SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-keys",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-keys",
"license": "MIT",
"dependencies": [
{

View File

@ -8,7 +8,7 @@
"Microsoft Azure Storage Blobs SDK for C++",
"This library provides Azure Storage Blobs SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-blobs",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-blobs",
"license": "MIT",
"dependencies": [
{

View File

@ -8,7 +8,7 @@
"Microsoft Azure Common Storage SDK for C++",
"This library provides common Azure Storage-related abstractions for Azure SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-common",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common",
"license": "MIT",
"dependencies": [
{

View File

@ -8,7 +8,7 @@
"Microsoft Azure Storage Files Data Lake SDK for C++",
"This library provides Azure Storage Files Data Lake SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-datalake",
"license": "MIT",
"dependencies": [
{

View File

@ -8,7 +8,7 @@
"Microsoft Azure Storage Files Shares SDK for C++",
"This library provides Azure Storage Files Shares SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-shares",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-shares",
"license": "MIT",
"dependencies": [
{

View File

@ -9,7 +9,7 @@
"This is a template library meant to illustrate initial client library development process for Azure SDK.",
"It is not meant to be published to vcpkg."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/template/azure-template",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/template/azure-template",
"license": "MIT",
"dependencies": [
{