[automated] Change default branch to master
This commit is contained in:
parent
28e8127658
commit
566f38d7e8
|
|
@ -1,19 +1,17 @@
|
||||||
init:
|
init:
|
||||||
- git config --global core.autocrlf true
|
- git config --global core.autocrlf true
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- release
|
- /^release\/.*$/
|
||||||
- dev
|
- /^(.*\/)?ci-.*$/
|
||||||
- /^(.*\/)?ci-.*$/
|
|
||||||
- /^rel\/.*/
|
|
||||||
build_script:
|
build_script:
|
||||||
- ps: .\run.ps1 default-build
|
- ps: .\run.ps1 default-build
|
||||||
clone_depth: 1
|
clone_depth: 1
|
||||||
environment:
|
environment:
|
||||||
global:
|
global:
|
||||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
||||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||||
test: off
|
test: 'off'
|
||||||
deploy: off
|
deploy: 'off'
|
||||||
image: Visual Studio 2017
|
image: Visual Studio 2017
|
||||||
|
|
|
||||||
24
.travis.yml
24
.travis.yml
|
|
@ -3,25 +3,25 @@ sudo: required
|
||||||
dist: trusty
|
dist: trusty
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
||||||
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
- libunwind8
|
- libunwind8
|
||||||
mono: none
|
mono: none
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
- osx
|
- osx
|
||||||
osx_image: xcode8.2
|
osx_image: xcode8.2
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- release
|
- /^release\/.*$/
|
||||||
- dev
|
- /^(.*\/)?ci-.*$/
|
||||||
- /^rel\/.*$/
|
|
||||||
- /^(.*\/)?ci-.*$/
|
|
||||||
before_install:
|
before_install:
|
||||||
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
|
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
|
||||||
|
/usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
|
||||||
|
/usr/local/lib/; fi
|
||||||
script:
|
script:
|
||||||
- ./build.sh
|
- ./build.sh
|
||||||
|
|
|
||||||
|
|
@ -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/project-ci.yml@buildtools
|
- template: .vsts-pipelines/templates/project-ci.yml@buildtools
|
||||||
|
|
|
||||||
|
|
@ -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/project-ci.yml@buildtools
|
- template: .vsts-pipelines/templates/project-ci.yml@buildtools
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"$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"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
6
run.ps1
6
run.ps1
|
|
@ -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
2
run.sh
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue