Merge branch 'release/2.1' into dev
This commit is contained in:
commit
53742ad649
|
|
@ -4,11 +4,9 @@ install:
|
|||
- ps: Install-Product node 6.9.2 x64
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
- release
|
||||
- dev
|
||||
- /^release\/.*$/
|
||||
- /^(.*\/)?ci-.*$/
|
||||
- /^rel\/.*/
|
||||
build_script:
|
||||
- ps: .\run.ps1 default-build
|
||||
clone_depth: 1
|
||||
|
|
@ -16,6 +14,6 @@ environment:
|
|||
global:
|
||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||
test: off
|
||||
deploy: off
|
||||
test: 'off'
|
||||
deploy: 'off'
|
||||
os: Visual Studio 2017
|
||||
|
|
|
|||
|
|
@ -17,3 +17,8 @@ os:
|
|||
osx_image: xcode7.1
|
||||
script:
|
||||
- ./build.sh
|
||||
branches:
|
||||
only:
|
||||
- dev
|
||||
- /^release\/.*$/
|
||||
- /^(.*\/)?ci-.*$/
|
||||
|
|
|
|||
Loading…
Reference in New Issue