From d1e67ba922b8576b3c93d4eb3ce5aa2a2d9223b9 Mon Sep 17 00:00:00 2001 From: Renze Yu Date: Mon, 12 Apr 2021 11:05:18 +0800 Subject: [PATCH] use main branch instead of master (#7287) --- azure-pipelines-master.yml | 8 ++++---- azure-pipelines.yml | 4 ++-- build.ps1 | 4 ++-- tools/Deployment/gulpfile.js | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/azure-pipelines-master.yml b/azure-pipelines-master.yml index 77c3f0a07b2..5c7c365648e 100644 --- a/azure-pipelines-master.yml +++ b/azure-pipelines-master.yml @@ -1,4 +1,4 @@ -# This YAML is used for the docfx v2 master release CI (https://dev.azure.com/ceapex/Engineering/_build?definitionId=1503&_a=summary) +# This YAML is used for the docfx v2 main release CI (https://dev.azure.com/ceapex/Engineering/_build?definitionId=1503&_a=summary) variables: - group: docfx-v2-pipeline-kv @@ -36,7 +36,7 @@ steps: displayName: 'gulp build' inputs: filename: node - arguments: '.\node_modules\gulp\bin\gulp.js master:build' + arguments: '.\node_modules\gulp\bin\gulp.js main:build' workingFolder: tools/Deployment env: TOKEN: $(ServiceAccountGithubToken) @@ -166,7 +166,7 @@ steps: displayName: 'gulp pack' inputs: filename: node - arguments: '.\node_modules\gulp\bin\gulp.js master:pack' + arguments: '.\node_modules\gulp\bin\gulp.js main:pack' workingFolder: tools/Deployment - task: EsrpCodeSigning@1 @@ -209,7 +209,7 @@ steps: displayName: 'gulp release' inputs: filename: node - arguments: '.\node_modules\gulp\bin\gulp.js master:release' + arguments: '.\node_modules\gulp\bin\gulp.js main:release' workingFolder: tools/Deployment env: NUGETAPIKEY: $(NugetAPIKey) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 567cbf016e9..6ec20e27521 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,10 +5,10 @@ trigger: branches: include: - dev - - master + - main pr: - dev -- master +- main pool: name: Hosted Windows 2019 with VS2019 diff --git a/build.ps1 b/build.ps1 index 9da16c9a494..7fc38f6084a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -19,7 +19,7 @@ $scriptRoot = $($MyInvocation.MyCommand.Definition) | Split-Path . "$scriptRoot/common.ps1" $ErrorActionPreference = 'Stop' -$releaseBranch = "master" +$releaseBranch = "main" $gitCommand = "git" $framework = "net472" $packageVersion = "1.0.0" @@ -64,7 +64,7 @@ if ($prod -eq $true) { ProcessLastExitCode $lastexitcode "Get GIT branch name $branch" } else { - $branch = "master"; + $branch = "main"; Write-Host "Release version using $branch branch" } diff --git a/tools/Deployment/gulpfile.js b/tools/Deployment/gulpfile.js index 4755e1dff31..8204cc307f5 100644 --- a/tools/Deployment/gulpfile.js +++ b/tools/Deployment/gulpfile.js @@ -227,8 +227,8 @@ gulp.task("dev", gulp.series("clean", "build", "e2eTest")); gulp.task("dev:build", gulp.series("clean", "build", "e2eTest")); gulp.task("dev:release", gulp.series("pack", "publish:azdevops-perf-login", "publish:azdevops-perf", "publish:azdevops-internal-login", "publish:azdevops-internal", "publish:azdevops-ppe-login", "publish:azdevops-ppe")); -gulp.task("master:build", gulp.series("clean", "build:release", "e2eTest", "updateGhPage")); -gulp.task("master:pack", gulp.series("pack")); -gulp.task("master:release", gulp.series("packAssetZip", "publish:azdevops-prod-login", "publish:azdevops-prod", "publish:nuget", "publish:gh-release", "publish:gh-asset", "publish:chocolatey")); +gulp.task("main:build", gulp.series("clean", "build:release", "e2eTest", "updateGhPage")); +gulp.task("main:pack", gulp.series("pack")); +gulp.task("main:release", gulp.series("packAssetZip", "publish:azdevops-prod-login", "publish:azdevops-prod", "publish:nuget", "publish:gh-release", "publish:gh-asset", "publish:chocolatey")); gulp.task("default", gulp.series("dev"));