Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster
2018-03-02 14:26:50 -08:00
2 changed files with 16 additions and 13 deletions

View File

@@ -1,21 +1,19 @@
init:
- git config --global core.autocrlf true
- git config --global core.autocrlf true
install:
- ps: Install-Product node 6.9.2 x64
- ps: Install-Product node 6.9.2 x64
branches:
only:
- master
- release
- dev
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
- /^rel\/.*/
build_script:
- ps: .\run.ps1 default-build
- ps: .\run.ps1 default-build
clone_depth: 1
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

View File

@@ -12,8 +12,13 @@ addons:
- zlib1g
mono: none
os:
- linux
- osx
- linux
- osx
osx_image: xcode7.1
script:
- ./build.sh
- ./build.sh
branches:
only:
- dev
- /^release\/.*$/
- /^(.*\/)?ci-.*$/