[automated] Change default branch to master

This commit is contained in:
Nate McMaster (automated) 2018-07-02 12:40:39 -07:00
parent 1f2e966454
commit 5273e4e7e8
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
7 changed files with 13 additions and 13 deletions

View File

@ -4,7 +4,7 @@ install:
- ps: Install-Product node 8 x64 - ps: Install-Product node 8 x64
branches: branches:
only: only:
- dev - master
- /^release\/.*$/ - /^release\/.*$/
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
build_script: build_script:

View File

@ -17,7 +17,7 @@ os:
osx_image: xcode9.2 osx_image: xcode9.2
branches: branches:
only: only:
- dev - master
- /^release\/.*$/ - /^release\/.*$/
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
before_install: before_install:

View File

@ -1,5 +1,5 @@
trigger: trigger:
- dev - master
- release/* - release/*
resources: resources:
@ -7,7 +7,7 @@ resources:
- repository: buildtools - repository: buildtools
type: git type: git
name: aspnet-BuildTools name: aspnet-BuildTools
ref: refs/heads/dev ref: refs/heads/master
phases: phases:
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools

View File

@ -1,5 +1,5 @@
trigger: trigger:
- dev - master
- release/* - release/*
# See https://github.com/aspnet/BuildTools # See https://github.com/aspnet/BuildTools
@ -9,7 +9,7 @@ resources:
type: github type: github
endpoint: DotNet-Bot GitHub Connection endpoint: DotNet-Bot GitHub Connection
name: aspnet/BuildTools name: aspnet/BuildTools
ref: refs/heads/dev ref: refs/heads/master
phases: phases:
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
@ -29,7 +29,7 @@ phases:
displayName: Use Node 8.x displayName: Use Node 8.x
inputs: inputs:
versionSpec: 8.x versionSpec: 8.x
- script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
displayName: install certs displayName: install certs
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools

View File

@ -1,6 +1,6 @@
{ {
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
"channel": "dev", "channel": "master",
"toolsets": { "toolsets": {
"nodejs": { "nodejs": {
"required": true, "required": true,

View File

@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
Example config file: Example config file:
```json ```json
{ {
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
"channel": "dev", "channel": "master",
"toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
} }
``` ```
@ -192,7 +192,7 @@ if (!$DotNetHome) {
else { Join-Path $PSScriptRoot '.dotnet'} else { Join-Path $PSScriptRoot '.dotnet'}
} }
if (!$Channel) { $Channel = 'dev' } if (!$Channel) { $Channel = 'master' }
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
# Execute # Execute

2
run.sh
View File

@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
[ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
fi fi
[ -z "$channel" ] && channel='dev' [ -z "$channel" ] && channel='master'
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
get_korebuild get_korebuild