Update various branch references to main branch (#10913)

This commit is contained in:
Karl Burtram
2020-06-13 14:26:18 -07:00
committed by GitHub
parent ddb210e971
commit 434d017a6b
35 changed files with 51 additions and 51 deletions

View File

@@ -216,10 +216,10 @@ async function publish(commit: string, quality: string, platform: string, type:
console.log('Asset:', JSON.stringify(asset, null, ' '));
// {{SQL CARBON EDIT}}
// Insiders: nightly build from master
// Insiders: nightly build from main
const isReleased = (
(
(quality === 'insider' && /^master$|^refs\/heads\/master$/.test(sourceBranch)) ||
(quality === 'insider' && /^main$|^refs\/heads\/main$/.test(sourceBranch)) ||
(quality === 'rc1' && /^release\/|^refs\/heads\/release\//.test(sourceBranch))
) &&
/Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy)

View File

@@ -3,10 +3,10 @@ pool:
trigger:
branches:
include: ['master', 'release/*']
include: ['main', 'release/*']
pr:
branches:
include: ['master', 'release/*']
include: ['main', 'release/*']
steps:
- task: NodeTool@0
@@ -34,8 +34,8 @@ steps:
git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
git fetch distro
# Push master branch into oss/master
git push distro origin/master:refs/heads/oss/master
# Push main branch into oss/master
git push distro origin/main:refs/heads/oss/master
# Push every release branch into oss/release
git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro

View File

@@ -3,10 +3,10 @@ pool:
trigger:
branches:
include: ['master']
include: ['main']
pr:
branches:
include: ['master']
include: ['main']
steps:
- task: NodeTool@0
@@ -32,9 +32,9 @@ steps:
git config user.name "VSCode"
git checkout origin/electron-8.0.x
git merge origin/master
git merge origin/main
# Push master branch into exploration branch
# Push main branch into exploration branch
git push origin HEAD:electron-8.0.x
displayName: Sync & Merge Exploration

View File

@@ -160,4 +160,4 @@ schedules:
displayName: Mon-Fri at 7:00
branches:
include:
- master
- main

View File

@@ -101,4 +101,4 @@ schedules:
displayName: Mon-Fri at 7:00
branches:
include:
- master
- main