Skip to content

Commit 53742ad

Browse files
author
Nate McMaster
committed
Merge branch 'release/2.1' into dev
2 parents 91a1d83 + f35c814 commit 53742ad

2 files changed

Lines changed: 16 additions & 13 deletions

File tree

‎.appveyor.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
init:
2-
- git config --global core.autocrlf true
2+
- git config --global core.autocrlf true
33
install:
4-
- ps: Install-Product node 6.9.2 x64
4+
- ps: Install-Product node 6.9.2 x64
55
branches:
66
only:
7-
- master
8-
- release
9-
- dev
10-
- /^(.*\/)?ci-.*$/
11-
- /^rel\/.*/
7+
- dev
8+
- /^release\/.*$/
9+
- /^(.*\/)?ci-.*$/
1210
build_script:
13-
- ps: .\run.ps1 default-build
11+
- ps: .\run.ps1 default-build
1412
clone_depth: 1
1513
environment:
1614
global:
1715
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1816
DOTNET_CLI_TELEMETRY_OPTOUT: 1
19-
test: off
20-
deploy: off
17+
test: 'off'
18+
deploy: 'off'
2119
os: Visual Studio 2017

‎.travis.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@ addons:
1212
- zlib1g
1313
mono: none
1414
os:
15-
- linux
16-
- osx
15+
- linux
16+
- osx
1717
osx_image: xcode7.1
1818
script:
19-
- ./build.sh
19+
- ./build.sh
20+
branches:
21+
only:
22+
- dev
23+
- /^release\/.*$/
24+
- /^(.*\/)?ci-.*$/

0 commit comments

Comments
 (0)